release: wuffs gen -version=0.4.0-alpha.3
diff --git a/release/c/wuffs-v0.4.c b/release/c/wuffs-v0.4.c
index bce9eb9..cb70fba 100644
--- a/release/c/wuffs-v0.4.c
+++ b/release/c/wuffs-v0.4.c
@@ -81,15 +81,15 @@
 // each major.minor branch, the commit count should increase monotonically.
 //
 // WUFFS_VERSION was overridden by "wuffs gen -version" based on revision
-// ae8531f7f846fbbe3a7340bf88499ad294a1367b committed on 2023-10-07.
+// 159634388902b8e4948b5c513072264acb70d42c committed on 2024-03-31.
 #define WUFFS_VERSION 0x000040000
 #define WUFFS_VERSION_MAJOR 0
 #define WUFFS_VERSION_MINOR 4
 #define WUFFS_VERSION_PATCH 0
-#define WUFFS_VERSION_PRE_RELEASE_LABEL "alpha.2"
-#define WUFFS_VERSION_BUILD_METADATA_COMMIT_COUNT 3603
-#define WUFFS_VERSION_BUILD_METADATA_COMMIT_DATE 20231007
-#define WUFFS_VERSION_STRING "0.4.0-alpha.2+3603.20231007"
+#define WUFFS_VERSION_PRE_RELEASE_LABEL "alpha.3"
+#define WUFFS_VERSION_BUILD_METADATA_COMMIT_COUNT 3731
+#define WUFFS_VERSION_BUILD_METADATA_COMMIT_DATE 20240331
+#define WUFFS_VERSION_STRING "0.4.0-alpha.3+3731.20240331"
 
 // ---------------- Configuration
 
@@ -350,9 +350,15 @@
 // The "defined(__clang__)" isn't redundant. While vanilla clang defines
 // __GNUC__, clang-cl (which mimics MSVC's cl.exe) does not.
 #if defined(__GNUC__) || defined(__clang__)
+#define WUFFS_BASE__FORCE_INLINE __attribute__((__always_inline__))
 #define WUFFS_BASE__POTENTIALLY_UNUSED __attribute__((unused))
 #define WUFFS_BASE__WARN_UNUSED_RESULT __attribute__((warn_unused_result))
+#elif defined(_MSC_VER)
+#define WUFFS_BASE__FORCE_INLINE __forceinline
+#define WUFFS_BASE__POTENTIALLY_UNUSED
+#define WUFFS_BASE__WARN_UNUSED_RESULT
 #else
+#define WUFFS_BASE__FORCE_INLINE
 #define WUFFS_BASE__POTENTIALLY_UNUSED
 #define WUFFS_BASE__WARN_UNUSED_RESULT
 #endif
@@ -415,6 +421,59 @@
 
 // --------
 
+#if defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-qual"
+#endif
+
+static inline uint8_t*  //
+wuffs_base__strip_const_from_u8_ptr(const uint8_t* ptr) {
+  return (uint8_t*)ptr;
+}
+
+static inline uint16_t*  //
+wuffs_base__strip_const_from_u16_ptr(const uint16_t* ptr) {
+  return (uint16_t*)ptr;
+}
+
+static inline uint32_t*  //
+wuffs_base__strip_const_from_u32_ptr(const uint32_t* ptr) {
+  return (uint32_t*)ptr;
+}
+
+static inline uint64_t*  //
+wuffs_base__strip_const_from_u64_ptr(const uint64_t* ptr) {
+  return (uint64_t*)ptr;
+}
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
+
+// --------
+
+// wuffs_private_impl__placeholder_etc_with_non_null_address provides non-NULL
+// pointers to various integer types. These values aren't intended to ever be
+// modified and their addresses aren't intended to ever be dereferenced.
+//
+// It's just that adding 0 to a NULL pointer can be undefined behavior (and
+// UBSAN will complain), so functions like wuffs_base__empty_slice_u8 need some
+// arbitrary non-NULL placeholder pointer, even though the slice has 0 length.
+
+extern const uint8_t  //
+    wuffs_private_impl__placeholder_u8_with_non_null_address;
+
+extern const uint16_t  //
+    wuffs_private_impl__placeholder_u16_with_non_null_address;
+
+extern const uint32_t  //
+    wuffs_private_impl__placeholder_u32_with_non_null_address;
+
+extern const uint64_t  //
+    wuffs_private_impl__placeholder_u64_with_non_null_address;
+
+// --------
+
 // wuffs_base__empty_struct is used when a Wuffs function returns an empty
 // struct. In C, if a function f returns void, you can't say "x = f()", but in
 // Wuffs, if a function g returns empty, you can say "y = g()".
@@ -483,6 +542,7 @@
 extern const char wuffs_base__suspension__mispositioned_read[];
 extern const char wuffs_base__suspension__mispositioned_write[];
 extern const char wuffs_base__suspension__short_read[];
+extern const char wuffs_base__suspension__short_workbuf[];
 extern const char wuffs_base__suspension__short_write[];
 extern const char wuffs_base__error__bad_i_o_position[];
 extern const char wuffs_base__error__bad_argument_length_too_short[];
@@ -496,9 +556,11 @@
 extern const char wuffs_base__error__bad_workbuf_length[];
 extern const char wuffs_base__error__bad_wuffs_version[];
 extern const char wuffs_base__error__cannot_return_a_suspension[];
+extern const char wuffs_base__error__disabled_by_wuffs_config_dst_pixel_format_enable_allowlist[];
 extern const char wuffs_base__error__disabled_by_previous_error[];
 extern const char wuffs_base__error__initialize_falsely_claimed_already_zeroed[];
 extern const char wuffs_base__error__initialize_not_called[];
+extern const char wuffs_base__error__insufficient_history[];
 extern const char wuffs_base__error__interleaved_coroutine_calls[];
 extern const char wuffs_base__error__no_more_information[];
 extern const char wuffs_base__error__not_enough_data[];
@@ -728,6 +790,9 @@
 // Lempel–Ziv 4.
 #define WUFFS_BASE__FOURCC__LZ4 0x4C5A3420
 
+// Lzip.
+#define WUFFS_BASE__FOURCC__LZIP 0x4C5A4950
+
 // Lempel–Ziv Markov-chain Algorithm.
 #define WUFFS_BASE__FOURCC__LZMA 0x4C5A4D41
 
@@ -1092,6 +1157,96 @@
 
 // --------
 
+typedef struct wuffs_base__bitvec256__struct {
+  // elements_u64[0] holds the LSBs (least significant bits) and
+  // elements_u64[3] holds the MSBs (most significant bits).
+  uint64_t elements_u64[4];
+} wuffs_base__bitvec256;
+
+static inline wuffs_base__bitvec256  //
+wuffs_base__make_bitvec256(uint64_t e00,
+                           uint64_t e01,
+                           uint64_t e02,
+                           uint64_t e03) {
+  wuffs_base__bitvec256 res;
+  res.elements_u64[0] = e00;
+  res.elements_u64[1] = e01;
+  res.elements_u64[2] = e02;
+  res.elements_u64[3] = e03;
+  return res;
+}
+
+static inline uint64_t  //
+wuffs_base__bitvec256__get_u64(const wuffs_base__bitvec256* b, uint32_t i) {
+  return b->elements_u64[i & 3];
+}
+
+// --------
+
+// wuffs_base__optional_u63 is like a std::optional<uint64_t>, but for C (not
+// just C++) and the value can only hold 63 bits (not 64).
+//
+// Do not manipulate repr directly; it is a private implementation detail.
+typedef struct wuffs_base__optional_u63__struct {
+  uint64_t repr;
+
+#ifdef __cplusplus
+  inline bool has_value() const;
+  inline uint64_t value() const;
+  inline uint64_t value_or(uint64_t default_value) const;
+#endif  // __cplusplus
+
+} wuffs_base__optional_u63;
+
+// wuffs_base__make_optional_u63 ignores value when has_value is false.
+//
+// Preconditions:
+//  - value < (1 << 63).
+static inline wuffs_base__optional_u63  //
+wuffs_base__make_optional_u63(bool has_value, uint64_t value) {
+  wuffs_base__optional_u63 res;
+  res.repr = has_value ? ((value << 1u) | 1u) : 0u;
+  return res;
+}
+
+static inline bool  //
+wuffs_base__optional_u63__has_value(const wuffs_base__optional_u63* o) {
+  return o->repr;
+}
+
+// wuffs_base__optional_u63__value returns zero when o does not have a value.
+static inline uint64_t  //
+wuffs_base__optional_u63__value(const wuffs_base__optional_u63* o) {
+  return o->repr >> 1u;
+}
+
+static inline uint64_t  //
+wuffs_base__optional_u63__value_or(const wuffs_base__optional_u63* o,
+                                   uint64_t default_value) {
+  return o->repr ? (o->repr >> 1u) : default_value;
+}
+
+#ifdef __cplusplus
+
+inline bool  //
+wuffs_base__optional_u63::has_value() const {
+  return wuffs_base__optional_u63__has_value(this);
+}
+
+inline uint64_t  //
+wuffs_base__optional_u63::value() const {
+  return wuffs_base__optional_u63__value(this);
+}
+
+inline uint64_t  //
+wuffs_base__optional_u63::value_or(uint64_t default_value) const {
+  return wuffs_base__optional_u63__value_or(this, default_value);
+}
+
+#endif  // __cplusplus
+
+// --------
+
 // The "defined(__clang__)" isn't redundant. While vanilla clang defines
 // __GNUC__, clang-cl (which mimics MSVC's cl.exe) does not.
 #if (defined(__GNUC__) || defined(__clang__)) && (__SIZEOF_LONG__ == 8)
@@ -1561,7 +1716,8 @@
 static inline wuffs_base__slice_u8  //
 wuffs_base__empty_slice_u8(void) {
   wuffs_base__slice_u8 ret;
-  ret.ptr = NULL;
+  ret.ptr = wuffs_base__strip_const_from_u8_ptr(
+      &wuffs_private_impl__placeholder_u8_with_non_null_address);
   ret.len = 0;
   return ret;
 }
@@ -1569,7 +1725,8 @@
 static inline wuffs_base__slice_u16  //
 wuffs_base__empty_slice_u16(void) {
   wuffs_base__slice_u16 ret;
-  ret.ptr = NULL;
+  ret.ptr = wuffs_base__strip_const_from_u16_ptr(
+      &wuffs_private_impl__placeholder_u16_with_non_null_address);
   ret.len = 0;
   return ret;
 }
@@ -1577,7 +1734,8 @@
 static inline wuffs_base__slice_u32  //
 wuffs_base__empty_slice_u32(void) {
   wuffs_base__slice_u32 ret;
-  ret.ptr = NULL;
+  ret.ptr = wuffs_base__strip_const_from_u32_ptr(
+      &wuffs_private_impl__placeholder_u32_with_non_null_address);
   ret.len = 0;
   return ret;
 }
@@ -1585,7 +1743,8 @@
 static inline wuffs_base__slice_u64  //
 wuffs_base__empty_slice_u64(void) {
   wuffs_base__slice_u64 ret;
-  ret.ptr = NULL;
+  ret.ptr = wuffs_base__strip_const_from_u64_ptr(
+      &wuffs_private_impl__placeholder_u64_with_non_null_address);
   ret.len = 0;
   return ret;
 }
@@ -1645,7 +1804,8 @@
 static inline wuffs_base__table_u8  //
 wuffs_base__empty_table_u8(void) {
   wuffs_base__table_u8 ret;
-  ret.ptr = NULL;
+  ret.ptr = wuffs_base__strip_const_from_u8_ptr(
+      &wuffs_private_impl__placeholder_u8_with_non_null_address);
   ret.width = 0;
   ret.height = 0;
   ret.stride = 0;
@@ -1655,7 +1815,8 @@
 static inline wuffs_base__table_u16  //
 wuffs_base__empty_table_u16(void) {
   wuffs_base__table_u16 ret;
-  ret.ptr = NULL;
+  ret.ptr = wuffs_base__strip_const_from_u16_ptr(
+      &wuffs_private_impl__placeholder_u16_with_non_null_address);
   ret.width = 0;
   ret.height = 0;
   ret.stride = 0;
@@ -1665,7 +1826,8 @@
 static inline wuffs_base__table_u32  //
 wuffs_base__empty_table_u32(void) {
   wuffs_base__table_u32 ret;
-  ret.ptr = NULL;
+  ret.ptr = wuffs_base__strip_const_from_u32_ptr(
+      &wuffs_private_impl__placeholder_u32_with_non_null_address);
   ret.width = 0;
   ret.height = 0;
   ret.stride = 0;
@@ -1675,7 +1837,8 @@
 static inline wuffs_base__table_u64  //
 wuffs_base__empty_table_u64(void) {
   wuffs_base__table_u64 ret;
-  ret.ptr = NULL;
+  ret.ptr = wuffs_base__strip_const_from_u64_ptr(
+      &wuffs_private_impl__placeholder_u64_with_non_null_address);
   ret.width = 0;
   ret.height = 0;
   ret.stride = 0;
@@ -1696,7 +1859,7 @@
   if ((i <= SIZE_MAX) && (i <= s.len)) {
     return wuffs_base__make_slice_u8(s.ptr + i, ((size_t)(s.len - i)));
   }
-  return wuffs_base__make_slice_u8(NULL, 0);
+  return wuffs_base__empty_slice_u8();
 }
 
 // wuffs_base__slice_u8__subslice_j returns s[:j].
@@ -1707,7 +1870,7 @@
   if ((j <= SIZE_MAX) && (j <= s.len)) {
     return wuffs_base__make_slice_u8(s.ptr, ((size_t)j));
   }
-  return wuffs_base__make_slice_u8(NULL, 0);
+  return wuffs_base__empty_slice_u8();
 }
 
 // wuffs_base__slice_u8__subslice_ij returns s[i:j].
@@ -1720,7 +1883,7 @@
   if ((i <= j) && (j <= SIZE_MAX) && (j <= s.len)) {
     return wuffs_base__make_slice_u8(s.ptr + i, ((size_t)(j - i)));
   }
-  return wuffs_base__make_slice_u8(NULL, 0);
+  return wuffs_base__empty_slice_u8();
 }
 
 // wuffs_base__table_u8__subtable_ij returns t[ix:jx, iy:jy].
@@ -2961,7 +3124,8 @@
 static inline wuffs_base__io_buffer  //
 wuffs_base__empty_io_buffer(void) {
   wuffs_base__io_buffer ret;
-  ret.data.ptr = NULL;
+  ret.data.ptr = wuffs_base__strip_const_from_u8_ptr(
+      &wuffs_private_impl__placeholder_u8_with_non_null_address);
   ret.data.len = 0;
   ret.meta.wi = 0;
   ret.meta.ri = 0;
@@ -3011,7 +3175,8 @@
 // wuffs_base__io_buffer__compact_retaining moves any written but unread bytes
 // closer to the start of the buffer. It retains H bytes of history (the most
 // recently read bytes), where H is min(buf->meta.ri, history_retain_length).
-// A postcondition is that buf->meta.ri == H.
+// It is therefore a no-op if history_retain_length is UINT64_MAX. A
+// postcondition is that buf->meta.ri == H.
 //
 // wuffs_base__io_buffer__compact_retaining(0) is equivalent to
 // wuffs_base__io_buffer__compact().
@@ -3421,6 +3586,25 @@
 
 // --------
 
+extern const wuffs_base__token  //
+    wuffs_private_impl__placeholder_token_with_non_null_address;
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic push
+#pragma GCC diagnostic ignored "-Wcast-qual"
+#endif
+
+static inline wuffs_base__token*  //
+wuffs_base__strip_const_from_token_ptr(const wuffs_base__token* ptr) {
+  return (wuffs_base__token*)ptr;
+}
+
+#if defined(__GNUC__)
+#pragma GCC diagnostic pop
+#endif
+
+// --------
+
 typedef WUFFS_BASE__SLICE(wuffs_base__token) wuffs_base__slice_token;
 
 static inline wuffs_base__slice_token  //
@@ -3434,7 +3618,8 @@
 static inline wuffs_base__slice_token  //
 wuffs_base__empty_slice_token(void) {
   wuffs_base__slice_token ret;
-  ret.ptr = NULL;
+  ret.ptr = wuffs_base__strip_const_from_token_ptr(
+      &wuffs_private_impl__placeholder_token_with_non_null_address);
   ret.len = 0;
   return ret;
 }
@@ -3523,7 +3708,8 @@
 static inline wuffs_base__token_buffer  //
 wuffs_base__empty_token_buffer(void) {
   wuffs_base__token_buffer ret;
-  ret.data.ptr = NULL;
+  ret.data.ptr = wuffs_base__strip_const_from_token_ptr(
+      &wuffs_private_impl__placeholder_token_with_non_null_address);
   ret.data.len = 0;
   ret.meta.wi = 0;
   ret.meta.ri = 0;
@@ -3574,7 +3760,8 @@
 // wuffs_base__token_buffer__compact_retaining moves any written but unread
 // tokens closer to the start of the buffer. It retains H tokens of history
 // (the most recently read tokens), where H is min(buf->meta.ri,
-// history_retain_length). A postcondition is that buf->meta.ri == H.
+// history_retain_length). It is therefore a no-op if history_retain_length is
+// UINT64_MAX. A postcondition is that buf->meta.ri == H.
 //
 // wuffs_base__token_buffer__compact_retaining(0) is equivalent to
 // wuffs_base__token_buffer__compact().
@@ -3741,7 +3928,7 @@
       return wuffs_base__make_slice_u8((uint8_t*)(p), (size_t)num_u8);
     }
   }
-  return wuffs_base__make_slice_u8(NULL, 0);
+  return wuffs_base__empty_slice_u8();
 }
 
 static inline wuffs_base__slice_u16  //
@@ -3752,7 +3939,7 @@
       return wuffs_base__make_slice_u16((uint16_t*)(p), (size_t)num_u16);
     }
   }
-  return wuffs_base__make_slice_u16(NULL, 0);
+  return wuffs_base__empty_slice_u16();
 }
 
 static inline wuffs_base__slice_u32  //
@@ -3763,7 +3950,7 @@
       return wuffs_base__make_slice_u32((uint32_t*)(p), (size_t)num_u32);
     }
   }
-  return wuffs_base__make_slice_u32(NULL, 0);
+  return wuffs_base__empty_slice_u32();
 }
 
 static inline wuffs_base__slice_u64  //
@@ -3774,7 +3961,7 @@
       return wuffs_base__make_slice_u64((uint64_t*)(p), (size_t)num_u64);
     }
   }
-  return wuffs_base__make_slice_u64(NULL, 0);
+  return wuffs_base__empty_slice_u64();
 }
 
 // ---------------- Images
@@ -3839,6 +4026,26 @@
 }
 
 static inline uint16_t  //
+wuffs_base__color_u32_argb_premul__as__color_u16_alpha_gray_nonpremul(
+    wuffs_base__color_u32_argb_premul c) {
+  uint32_t a = 0xFF & (c >> 24);
+  if (a == 0) {
+    return 0;
+  }
+  uint32_t a16 = a * 0x101;
+
+  uint32_t cr = 0xFF & (c >> 16);
+  cr = (cr * (0x101 * 0xFFFF)) / a16;
+  uint32_t cg = 0xFF & (c >> 8);
+  cg = (cg * (0x101 * 0xFFFF)) / a16;
+  uint32_t cb = 0xFF & (c >> 0);
+  cb = (cb * (0x101 * 0xFFFF)) / a16;
+
+  uint32_t weighted_average = (19595 * cr) + (38470 * cg) + (7471 * cb) + 32768;
+  return (uint16_t)((a16 & 0xFF00) | (weighted_average >> 24));
+}
+
+static inline uint16_t  //
 wuffs_base__color_u32_argb_premul__as__color_u16_gray(
     wuffs_base__color_u32_argb_premul c) {
   // Work in 16-bit color.
@@ -4114,49 +4321,53 @@
 // Common 8-bit-depth pixel formats. This list is not exhaustive; not all valid
 // wuffs_base__pixel_format values are present.
 
-#define WUFFS_BASE__PIXEL_FORMAT__INVALID 0x00000000
+// clang-format off
 
-#define WUFFS_BASE__PIXEL_FORMAT__A 0x02000008
+#define WUFFS_BASE__PIXEL_FORMAT__INVALID                   0x00000000
 
-#define WUFFS_BASE__PIXEL_FORMAT__Y 0x20000008
-#define WUFFS_BASE__PIXEL_FORMAT__Y_16LE 0x2000000B
-#define WUFFS_BASE__PIXEL_FORMAT__Y_16BE 0x2010000B
-#define WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL 0x21000008
-#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL 0x22000008
+#define WUFFS_BASE__PIXEL_FORMAT__A                         0x02000008
 
-#define WUFFS_BASE__PIXEL_FORMAT__YCBCR 0x40020888
-#define WUFFS_BASE__PIXEL_FORMAT__YCBCRA_NONPREMUL 0x41038888
-#define WUFFS_BASE__PIXEL_FORMAT__YCBCRK 0x50038888
+#define WUFFS_BASE__PIXEL_FORMAT__Y                         0x20000008
+#define WUFFS_BASE__PIXEL_FORMAT__Y_16LE                    0x2000000B
+#define WUFFS_BASE__PIXEL_FORMAT__Y_16BE                    0x2010000B
+#define WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL              0x21000088
+#define WUFFS_BASE__PIXEL_FORMAT__YA_PREMUL                 0x22000088
 
-#define WUFFS_BASE__PIXEL_FORMAT__YCOCG 0x60020888
-#define WUFFS_BASE__PIXEL_FORMAT__YCOCGA_NONPREMUL 0x61038888
-#define WUFFS_BASE__PIXEL_FORMAT__YCOCGK 0x70038888
+#define WUFFS_BASE__PIXEL_FORMAT__YCBCR                     0x40020888
+#define WUFFS_BASE__PIXEL_FORMAT__YCBCRA_NONPREMUL          0x41038888
+#define WUFFS_BASE__PIXEL_FORMAT__YCBCRK                    0x50038888
 
-#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL 0x81040008
-#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL 0x82040008
-#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY 0x83040008
+#define WUFFS_BASE__PIXEL_FORMAT__YCOCG                     0x60020888
+#define WUFFS_BASE__PIXEL_FORMAT__YCOCGA_NONPREMUL          0x61038888
+#define WUFFS_BASE__PIXEL_FORMAT__YCOCGK                    0x70038888
 
-#define WUFFS_BASE__PIXEL_FORMAT__BGR_565 0x80000565
-#define WUFFS_BASE__PIXEL_FORMAT__BGR 0x80000888
-#define WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL 0x81008888
-#define WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE 0x8100BBBB
-#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL 0x82008888
-#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE 0x8200BBBB
-#define WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY 0x83008888
-#define WUFFS_BASE__PIXEL_FORMAT__BGRX 0x90008888
+#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL   0x81040008
+#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL      0x82040008
+#define WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY      0x83040008
 
-#define WUFFS_BASE__PIXEL_FORMAT__RGB 0xA0000888
-#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL 0xA1008888
-#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL_4X16LE 0xA100BBBB
-#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL 0xA2008888
-#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL_4X16LE 0xA200BBBB
-#define WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY 0xA3008888
-#define WUFFS_BASE__PIXEL_FORMAT__RGBX 0xB0008888
+#define WUFFS_BASE__PIXEL_FORMAT__BGR_565                   0x80000565
+#define WUFFS_BASE__PIXEL_FORMAT__BGR                       0x80000888
+#define WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL            0x81008888
+#define WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE     0x8100BBBB
+#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL               0x82008888
+#define WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE        0x8200BBBB
+#define WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY               0x83008888
+#define WUFFS_BASE__PIXEL_FORMAT__BGRX                      0x90008888
 
-#define WUFFS_BASE__PIXEL_FORMAT__CMY 0xC0020888
-#define WUFFS_BASE__PIXEL_FORMAT__CMYK 0xD0038888
+#define WUFFS_BASE__PIXEL_FORMAT__RGB                       0xA0000888
+#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL            0xA1008888
+#define WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL_4X16LE     0xA100BBBB
+#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL               0xA2008888
+#define WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL_4X16LE        0xA200BBBB
+#define WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY               0xA3008888
+#define WUFFS_BASE__PIXEL_FORMAT__RGBX                      0xB0008888
 
-extern const uint32_t wuffs_base__pixel_format__bits_per_channel[16];
+#define WUFFS_BASE__PIXEL_FORMAT__CMY                       0xC0020888
+#define WUFFS_BASE__PIXEL_FORMAT__CMYK                      0xD0038888
+
+// clang-format on
+
+extern const uint32_t wuffs_private_impl__pixel_format__bits_per_channel[16];
 
 static inline bool  //
 wuffs_base__pixel_format__is_valid(const wuffs_base__pixel_format* f) {
@@ -4170,10 +4381,14 @@
   if (((f->repr >> 16) & 0x03) != 0) {
     return 0;
   }
-  return wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 0)] +
-         wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 4)] +
-         wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 8)] +
-         wuffs_base__pixel_format__bits_per_channel[0x0F & (f->repr >> 12)];
+  return wuffs_private_impl__pixel_format__bits_per_channel[0x0F &
+                                                            (f->repr >> 0)] +
+         wuffs_private_impl__pixel_format__bits_per_channel[0x0F &
+                                                            (f->repr >> 4)] +
+         wuffs_private_impl__pixel_format__bits_per_channel[0x0F &
+                                                            (f->repr >> 8)] +
+         wuffs_private_impl__pixel_format__bits_per_channel[0x0F &
+                                                            (f->repr >> 12)];
 }
 
 static inline bool  //
@@ -4391,15 +4606,20 @@
     return;
   }
   if (pixfmt_repr) {
-    uint64_t wh = ((uint64_t)width) * ((uint64_t)height);
-    // TODO: handle things other than 1 byte per pixel.
-    if (wh <= ((uint64_t)SIZE_MAX)) {
+    do {
+#if SIZE_MAX < UINT64_MAX
+      uint64_t wh = ((uint64_t)width) * ((uint64_t)height);
+      // TODO: handle things other than 1 byte per pixel.
+      if (wh > ((uint64_t)SIZE_MAX)) {
+        break;
+      }
+#endif
       c->private_impl.pixfmt.repr = pixfmt_repr;
       c->private_impl.pixsub.repr = pixsub_repr;
       c->private_impl.width = width;
       c->private_impl.height = height;
       return;
-    }
+    } while (0);
   }
 
   c->private_impl.pixfmt.repr = 0;
@@ -5117,7 +5337,7 @@
           tab->ptr, WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH);
     }
   }
-  return wuffs_base__make_slice_u8(NULL, 0);
+  return wuffs_base__empty_slice_u8();
 }
 
 static inline wuffs_base__slice_u8  //
@@ -6202,6 +6422,113 @@
 
 // --------
 
+extern const char wuffs_base__hasher_bitvec256__vtable_name[];
+
+typedef struct wuffs_base__hasher_bitvec256__func_ptrs__struct {
+  wuffs_base__bitvec256 (*checksum_bitvec256)(
+    const void* self);
+  uint64_t (*get_quirk)(
+    const void* self,
+    uint32_t a_key);
+  wuffs_base__status (*set_quirk)(
+    void* self,
+    uint32_t a_key,
+    uint64_t a_value);
+  wuffs_base__empty_struct (*update)(
+    void* self,
+    wuffs_base__slice_u8 a_x);
+  wuffs_base__bitvec256 (*update_bitvec256)(
+    void* self,
+    wuffs_base__slice_u8 a_x);
+} wuffs_base__hasher_bitvec256__func_ptrs;
+
+typedef struct wuffs_base__hasher_bitvec256__struct wuffs_base__hasher_bitvec256;
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__bitvec256
+wuffs_base__hasher_bitvec256__checksum_bitvec256(
+    const wuffs_base__hasher_bitvec256* self);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC uint64_t
+wuffs_base__hasher_bitvec256__get_quirk(
+    const wuffs_base__hasher_bitvec256* self,
+    uint32_t a_key);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__status
+wuffs_base__hasher_bitvec256__set_quirk(
+    wuffs_base__hasher_bitvec256* self,
+    uint32_t a_key,
+    uint64_t a_value);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
+wuffs_base__hasher_bitvec256__update(
+    wuffs_base__hasher_bitvec256* self,
+    wuffs_base__slice_u8 a_x);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__bitvec256
+wuffs_base__hasher_bitvec256__update_bitvec256(
+    wuffs_base__hasher_bitvec256* self,
+    wuffs_base__slice_u8 a_x);
+
+#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
+
+struct wuffs_base__hasher_bitvec256__struct {
+  struct {
+    uint32_t magic;
+    uint32_t active_coroutine;
+    wuffs_base__vtable first_vtable;
+  } private_impl;
+
+#ifdef __cplusplus
+#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
+  using unique_ptr = std::unique_ptr<wuffs_base__hasher_bitvec256, wuffs_unique_ptr_deleter>;
+#endif
+
+  inline wuffs_base__bitvec256
+  checksum_bitvec256() const {
+    return wuffs_base__hasher_bitvec256__checksum_bitvec256(this);
+  }
+
+  inline uint64_t
+  get_quirk(
+      uint32_t a_key) const {
+    return wuffs_base__hasher_bitvec256__get_quirk(
+        this, a_key);
+  }
+
+  inline wuffs_base__status
+  set_quirk(
+      uint32_t a_key,
+      uint64_t a_value) {
+    return wuffs_base__hasher_bitvec256__set_quirk(
+        this, a_key, a_value);
+  }
+
+  inline wuffs_base__empty_struct
+  update(
+      wuffs_base__slice_u8 a_x) {
+    return wuffs_base__hasher_bitvec256__update(
+        this, a_x);
+  }
+
+  inline wuffs_base__bitvec256
+  update_bitvec256(
+      wuffs_base__slice_u8 a_x) {
+    return wuffs_base__hasher_bitvec256__update_bitvec256(
+        this, a_x);
+  }
+
+#endif  // __cplusplus
+};  // struct wuffs_base__hasher_bitvec256__struct
+
+#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
+
+// --------
+
 extern const char wuffs_base__image_decoder__vtable_name[];
 
 typedef struct wuffs_base__image_decoder__func_ptrs__struct {
@@ -6225,8 +6552,6 @@
   uint64_t (*get_quirk)(
     const void* self,
     uint32_t a_key);
-  uint64_t (*history_retain_length)(
-    const void* self);
   uint32_t (*num_animation_loops)(
     const void* self);
   uint64_t (*num_decoded_frame_configs)(
@@ -6292,11 +6617,6 @@
     uint32_t a_key);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__image_decoder__history_retain_length(
-    const wuffs_base__image_decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC uint32_t
 wuffs_base__image_decoder__num_animation_loops(
     const wuffs_base__image_decoder* self);
@@ -6398,11 +6718,6 @@
         this, a_key);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_base__image_decoder__history_retain_length(this);
-  }
-
   inline uint32_t
   num_animation_loops() const {
     return wuffs_base__image_decoder__num_animation_loops(this);
@@ -6466,11 +6781,11 @@
 extern const char wuffs_base__io_transformer__vtable_name[];
 
 typedef struct wuffs_base__io_transformer__func_ptrs__struct {
+  wuffs_base__optional_u63 (*dst_history_retain_length)(
+    const void* self);
   uint64_t (*get_quirk)(
     const void* self,
     uint32_t a_key);
-  uint64_t (*history_retain_length)(
-    const void* self);
   wuffs_base__status (*set_quirk)(
     void* self,
     uint32_t a_key,
@@ -6487,17 +6802,17 @@
 typedef struct wuffs_base__io_transformer__struct wuffs_base__io_transformer;
 
 WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63
+wuffs_base__io_transformer__dst_history_retain_length(
+    const wuffs_base__io_transformer* self);
+
+WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC uint64_t
 wuffs_base__io_transformer__get_quirk(
     const wuffs_base__io_transformer* self,
     uint32_t a_key);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__io_transformer__history_retain_length(
-    const wuffs_base__io_transformer* self);
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC wuffs_base__status
 wuffs_base__io_transformer__set_quirk(
     wuffs_base__io_transformer* self,
@@ -6531,6 +6846,11 @@
   using unique_ptr = std::unique_ptr<wuffs_base__io_transformer, wuffs_unique_ptr_deleter>;
 #endif
 
+  inline wuffs_base__optional_u63
+  dst_history_retain_length() const {
+    return wuffs_base__io_transformer__dst_history_retain_length(this);
+  }
+
   inline uint64_t
   get_quirk(
       uint32_t a_key) const {
@@ -6538,11 +6858,6 @@
         this, a_key);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_base__io_transformer__history_retain_length(this);
-  }
-
   inline wuffs_base__status
   set_quirk(
       uint32_t a_key,
@@ -6583,8 +6898,6 @@
   uint64_t (*get_quirk)(
     const void* self,
     uint32_t a_key);
-  uint64_t (*history_retain_length)(
-    const void* self);
   wuffs_base__status (*set_quirk)(
     void* self,
     uint32_t a_key,
@@ -6610,11 +6923,6 @@
     uint32_t a_key);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__token_decoder__history_retain_length(
-    const wuffs_base__token_decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC wuffs_base__status
 wuffs_base__token_decoder__set_quirk(
     wuffs_base__token_decoder* self,
@@ -6656,11 +6964,6 @@
         this, a_key);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_base__token_decoder__history_retain_length(this);
-  }
-
   inline wuffs_base__status
   set_quirk(
       uint32_t a_key,
@@ -6918,9 +7221,7 @@
 
 // ---------------- Public Consts
 
-#define WUFFS_BMP__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0
-
-#define WUFFS_BMP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
+#define WUFFS_BMP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u
 
 // ---------------- Struct Declarations
 
@@ -7054,11 +7355,6 @@
     wuffs_base__io_buffer* a_src);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_bmp__decoder__history_retain_length(
-    const wuffs_bmp__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
 wuffs_bmp__decoder__workbuf_len(
     const wuffs_bmp__decoder* self);
@@ -7116,14 +7412,14 @@
     bool f_rle_padded;
     wuffs_base__pixel_swizzler f_swizzler;
 
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
-    uint32_t p_tell_me_more[1];
-    uint32_t p_read_palette[1];
+    uint32_t p_decode_image_config;
+    uint32_t p_do_decode_image_config;
+    uint32_t p_decode_frame_config;
+    uint32_t p_do_decode_frame_config;
+    uint32_t p_decode_frame;
+    uint32_t p_do_decode_frame;
+    uint32_t p_tell_me_more;
+    uint32_t p_read_palette;
   } private_impl;
 
   struct {
@@ -7132,14 +7428,14 @@
 
     struct {
       uint64_t scratch;
-    } s_do_decode_image_config[1];
+    } s_do_decode_image_config;
     struct {
       uint64_t scratch;
-    } s_do_decode_frame[1];
+    } s_do_decode_frame;
     struct {
       uint32_t v_i;
       uint64_t scratch;
-    } s_read_palette[1];
+    } s_read_palette;
   } private_data;
 
 #ifdef __cplusplus
@@ -7283,11 +7579,6 @@
     return wuffs_bmp__decoder__tell_me_more(this, a_dst, a_minfo, a_src);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_bmp__decoder__history_retain_length(this);
-  }
-
   inline wuffs_base__range_ii_u64
   workbuf_len() const {
     return wuffs_bmp__decoder__workbuf_len(this);
@@ -7316,9 +7607,9 @@
 
 // ---------------- Public Consts
 
-#define WUFFS_BZIP2__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0
+#define WUFFS_BZIP2__DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u
 
-#define WUFFS_BZIP2__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
+#define WUFFS_BZIP2__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u
 
 // ---------------- Struct Declarations
 
@@ -7386,8 +7677,8 @@
     uint64_t a_value);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_bzip2__decoder__history_retain_length(
+WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63
+wuffs_bzip2__decoder__dst_history_retain_length(
     const wuffs_bzip2__decoder* self);
 
 WUFFS_BASE__GENERATED_C_CODE
@@ -7452,12 +7743,12 @@
     uint32_t f_num_sections;
     uint32_t f_code_lengths_bitmask;
 
-    uint32_t p_transform_io[1];
-    uint32_t p_do_transform_io[1];
-    uint32_t p_prepare_block[1];
-    uint32_t p_read_code_lengths[1];
-    uint32_t p_flush_slow[1];
-    uint32_t p_decode_huffman_slow[1];
+    uint32_t p_transform_io;
+    uint32_t p_do_transform_io;
+    uint32_t p_prepare_block;
+    uint32_t p_read_code_lengths;
+    uint32_t p_flush_slow;
+    uint32_t p_decode_huffman_slow;
   } private_impl;
 
   struct {
@@ -7474,15 +7765,15 @@
       uint32_t v_i;
       uint64_t v_tag;
       uint32_t v_final_checksum_want;
-    } s_do_transform_io[1];
+    } s_do_transform_io;
     struct {
       uint32_t v_i;
       uint32_t v_selector;
-    } s_prepare_block[1];
+    } s_prepare_block;
     struct {
       uint32_t v_i;
       uint32_t v_code_length;
-    } s_read_code_lengths[1];
+    } s_read_code_lengths;
     struct {
       uint32_t v_flush_pointer;
       uint32_t v_flush_repeat_count;
@@ -7491,10 +7782,10 @@
       uint32_t v_block_size;
       uint8_t v_curr;
       uint64_t scratch;
-    } s_flush_slow[1];
+    } s_flush_slow;
     struct {
       uint32_t v_node_index;
-    } s_decode_huffman_slow[1];
+    } s_decode_huffman_slow;
   } private_data;
 
 #ifdef __cplusplus
@@ -7572,9 +7863,9 @@
     return wuffs_bzip2__decoder__set_quirk(this, a_key, a_value);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_bzip2__decoder__history_retain_length(this);
+  inline wuffs_base__optional_u63
+  dst_history_retain_length() const {
+    return wuffs_bzip2__decoder__dst_history_retain_length(this);
   }
 
   inline wuffs_base__range_ii_u64
@@ -7606,25 +7897,23 @@
 
 // ---------------- Public Consts
 
-#define WUFFS_CBOR__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0
+#define WUFFS_CBOR__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u
 
-#define WUFFS_CBOR__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
+#define WUFFS_CBOR__DECODER_DEPTH_MAX_INCL 1024u
 
-#define WUFFS_CBOR__DECODER_DEPTH_MAX_INCL 1024
+#define WUFFS_CBOR__DECODER_DST_TOKEN_BUFFER_LENGTH_MIN_INCL 2u
 
-#define WUFFS_CBOR__DECODER_DST_TOKEN_BUFFER_LENGTH_MIN_INCL 2
+#define WUFFS_CBOR__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL 9u
 
-#define WUFFS_CBOR__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL 9
+#define WUFFS_CBOR__TOKEN_VALUE_MAJOR 787997u
 
-#define WUFFS_CBOR__TOKEN_VALUE_MAJOR 787997
+#define WUFFS_CBOR__TOKEN_VALUE_MINOR__DETAIL_MASK 262143u
 
-#define WUFFS_CBOR__TOKEN_VALUE_MINOR__DETAIL_MASK 262143
+#define WUFFS_CBOR__TOKEN_VALUE_MINOR__MINUS_1_MINUS_X 16777216u
 
-#define WUFFS_CBOR__TOKEN_VALUE_MINOR__MINUS_1_MINUS_X 16777216
+#define WUFFS_CBOR__TOKEN_VALUE_MINOR__SIMPLE_VALUE 8388608u
 
-#define WUFFS_CBOR__TOKEN_VALUE_MINOR__SIMPLE_VALUE 8388608
-
-#define WUFFS_CBOR__TOKEN_VALUE_MINOR__TAG 4194304
+#define WUFFS_CBOR__TOKEN_VALUE_MINOR__TAG 4194304u
 
 // ---------------- Struct Declarations
 
@@ -7692,11 +7981,6 @@
     uint64_t a_value);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_cbor__decoder__history_retain_length(
-    const wuffs_cbor__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
 wuffs_cbor__decoder__workbuf_len(
     const wuffs_cbor__decoder* self);
@@ -7738,7 +8022,7 @@
 
     bool f_end_of_data;
 
-    uint32_t p_decode_tokens[1];
+    uint32_t p_decode_tokens;
   } private_impl;
 
   struct {
@@ -7750,7 +8034,7 @@
       uint32_t v_depth;
       bool v_tagged;
       uint8_t v_indefinite_string_major_type;
-    } s_decode_tokens[1];
+    } s_decode_tokens;
   } private_data;
 
 #ifdef __cplusplus
@@ -7828,11 +8112,6 @@
     return wuffs_cbor__decoder__set_quirk(this, a_key, a_value);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_cbor__decoder__history_retain_length(this);
-  }
-
   inline wuffs_base__range_ii_u64
   workbuf_len() const {
     return wuffs_cbor__decoder__workbuf_len(this);
@@ -8074,6 +8353,223 @@
 
 #endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CRC32) || defined(WUFFS_NONMONOLITHIC)
 
+#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CRC64) || defined(WUFFS_NONMONOLITHIC)
+
+// ---------------- Status Codes
+
+// ---------------- Public Consts
+
+// ---------------- Struct Declarations
+
+typedef struct wuffs_crc64__ecma_hasher__struct wuffs_crc64__ecma_hasher;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// ---------------- Public Initializer Prototypes
+
+// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
+// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
+//
+// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
+// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
+
+wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
+wuffs_crc64__ecma_hasher__initialize(
+    wuffs_crc64__ecma_hasher* self,
+    size_t sizeof_star_self,
+    uint64_t wuffs_version,
+    uint32_t options);
+
+size_t
+sizeof__wuffs_crc64__ecma_hasher(void);
+
+// ---------------- Allocs
+
+// These functions allocate and initialize Wuffs structs. They return NULL if
+// memory allocation fails. If they return non-NULL, there is no need to call
+// wuffs_foo__bar__initialize, but the caller is responsible for eventually
+// calling free on the returned pointer. That pointer is effectively a C++
+// std::unique_ptr<T, wuffs_unique_ptr_deleter>.
+
+wuffs_crc64__ecma_hasher*
+wuffs_crc64__ecma_hasher__alloc(void);
+
+static inline wuffs_base__hasher_u64*
+wuffs_crc64__ecma_hasher__alloc_as__wuffs_base__hasher_u64(void) {
+  return (wuffs_base__hasher_u64*)(wuffs_crc64__ecma_hasher__alloc());
+}
+
+// ---------------- Upcasts
+
+static inline wuffs_base__hasher_u64*
+wuffs_crc64__ecma_hasher__upcast_as__wuffs_base__hasher_u64(
+    wuffs_crc64__ecma_hasher* p) {
+  return (wuffs_base__hasher_u64*)p;
+}
+
+// ---------------- Public Function Prototypes
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC uint64_t
+wuffs_crc64__ecma_hasher__get_quirk(
+    const wuffs_crc64__ecma_hasher* self,
+    uint32_t a_key);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__status
+wuffs_crc64__ecma_hasher__set_quirk(
+    wuffs_crc64__ecma_hasher* self,
+    uint32_t a_key,
+    uint64_t a_value);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
+wuffs_crc64__ecma_hasher__update(
+    wuffs_crc64__ecma_hasher* self,
+    wuffs_base__slice_u8 a_x);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC uint64_t
+wuffs_crc64__ecma_hasher__update_u64(
+    wuffs_crc64__ecma_hasher* self,
+    wuffs_base__slice_u8 a_x);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC uint64_t
+wuffs_crc64__ecma_hasher__checksum_u64(
+    const wuffs_crc64__ecma_hasher* self);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+// ---------------- Struct Definitions
+
+// These structs' fields, and the sizeof them, are private implementation
+// details that aren't guaranteed to be stable across Wuffs versions.
+//
+// See https://en.wikipedia.org/wiki/Opaque_pointer#C
+
+#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
+
+struct wuffs_crc64__ecma_hasher__struct {
+  // Do not access the private_impl's or private_data's fields directly. There
+  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
+  // the wuffs_foo__bar__baz functions.
+  //
+  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
+  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
+
+  struct {
+    uint32_t magic;
+    uint32_t active_coroutine;
+    wuffs_base__vtable vtable_for__wuffs_base__hasher_u64;
+    wuffs_base__vtable null_vtable;
+
+    uint64_t f_state;
+  } private_impl;
+
+#ifdef __cplusplus
+#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
+  using unique_ptr = std::unique_ptr<wuffs_crc64__ecma_hasher, wuffs_unique_ptr_deleter>;
+
+  // On failure, the alloc_etc functions return nullptr. They don't throw.
+
+  static inline unique_ptr
+  alloc() {
+    return unique_ptr(wuffs_crc64__ecma_hasher__alloc());
+  }
+
+  static inline wuffs_base__hasher_u64::unique_ptr
+  alloc_as__wuffs_base__hasher_u64() {
+    return wuffs_base__hasher_u64::unique_ptr(
+        wuffs_crc64__ecma_hasher__alloc_as__wuffs_base__hasher_u64());
+  }
+#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
+
+#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
+  // Disallow constructing or copying an object via standard C++ mechanisms,
+  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
+  // size and field layout is not part of the public, stable, memory-safe API.
+  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
+  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
+  // their first argument) rather than tweaking bar.private_impl.qux fields.
+  //
+  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
+  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
+  // order to provide convenience methods. These forward on "this", so that you
+  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
+  wuffs_crc64__ecma_hasher__struct() = delete;
+  wuffs_crc64__ecma_hasher__struct(const wuffs_crc64__ecma_hasher__struct&) = delete;
+  wuffs_crc64__ecma_hasher__struct& operator=(
+      const wuffs_crc64__ecma_hasher__struct&) = delete;
+#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
+
+#if !defined(WUFFS_IMPLEMENTATION)
+  // As above, the size of the struct is not part of the public API, and unless
+  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
+  // allocated, not stack allocated. Its size is not intended to be known at
+  // compile time, but it is unfortunately divulged as a side effect of
+  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
+  // instead of "sizeof T", invoking the operator. To make the two values
+  // different, so that passing the latter will be rejected by the initialize
+  // function, we add an arbitrary amount of dead weight.
+  uint8_t dead_weight[123000000];  // 123 MB.
+#endif  // !defined(WUFFS_IMPLEMENTATION)
+
+  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
+  initialize(
+      size_t sizeof_star_self,
+      uint64_t wuffs_version,
+      uint32_t options) {
+    return wuffs_crc64__ecma_hasher__initialize(
+        this, sizeof_star_self, wuffs_version, options);
+  }
+
+  inline wuffs_base__hasher_u64*
+  upcast_as__wuffs_base__hasher_u64() {
+    return (wuffs_base__hasher_u64*)this;
+  }
+
+  inline uint64_t
+  get_quirk(
+      uint32_t a_key) const {
+    return wuffs_crc64__ecma_hasher__get_quirk(this, a_key);
+  }
+
+  inline wuffs_base__status
+  set_quirk(
+      uint32_t a_key,
+      uint64_t a_value) {
+    return wuffs_crc64__ecma_hasher__set_quirk(this, a_key, a_value);
+  }
+
+  inline wuffs_base__empty_struct
+  update(
+      wuffs_base__slice_u8 a_x) {
+    return wuffs_crc64__ecma_hasher__update(this, a_x);
+  }
+
+  inline uint64_t
+  update_u64(
+      wuffs_base__slice_u8 a_x) {
+    return wuffs_crc64__ecma_hasher__update_u64(this, a_x);
+  }
+
+  inline uint64_t
+  checksum_u64() const {
+    return wuffs_crc64__ecma_hasher__checksum_u64(this);
+  }
+
+#endif  // __cplusplus
+};  // struct wuffs_crc64__ecma_hasher__struct
+
+#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
+
+#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__CRC64) || defined(WUFFS_NONMONOLITHIC)
+
 #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__DEFLATE) || defined(WUFFS_NONMONOLITHIC)
 
 // ---------------- Status Codes
@@ -8095,9 +8591,9 @@
 
 // ---------------- Public Consts
 
-#define WUFFS_DEFLATE__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0
+#define WUFFS_DEFLATE__DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u
 
-#define WUFFS_DEFLATE__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 1
+#define WUFFS_DEFLATE__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 1u
 
 // ---------------- Struct Declarations
 
@@ -8171,8 +8667,8 @@
     uint64_t a_value);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_deflate__decoder__history_retain_length(
+WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63
+wuffs_deflate__decoder__dst_history_retain_length(
     const wuffs_deflate__decoder* self);
 
 WUFFS_BASE__GENERATED_C_CODE
@@ -8222,16 +8718,16 @@
     uint32_t f_n_huffs_bits[2];
     bool f_end_of_block;
 
-    uint32_t p_transform_io[1];
-    uint32_t p_do_transform_io[1];
-    uint32_t p_decode_blocks[1];
-    uint32_t p_decode_uncompressed[1];
-    uint32_t p_init_dynamic_huffman[1];
+    uint32_t p_transform_io;
+    uint32_t p_do_transform_io;
+    uint32_t p_decode_blocks;
+    uint32_t p_decode_uncompressed;
+    uint32_t p_init_dynamic_huffman;
     wuffs_base__status (*choosy_decode_huffman_fast64)(
         wuffs_deflate__decoder* self,
         wuffs_base__io_buffer* a_dst,
         wuffs_base__io_buffer* a_src);
-    uint32_t p_decode_huffman_slow[1];
+    uint32_t p_decode_huffman_slow;
   } private_impl;
 
   struct {
@@ -8241,11 +8737,11 @@
 
     struct {
       uint32_t v_final;
-    } s_decode_blocks[1];
+    } s_decode_blocks;
     struct {
       uint32_t v_length;
       uint64_t scratch;
-    } s_decode_uncompressed[1];
+    } s_decode_uncompressed;
     struct {
       uint32_t v_bits;
       uint32_t v_n_bits;
@@ -8257,7 +8753,7 @@
       uint32_t v_n_extra_bits;
       uint8_t v_rep_symbol;
       uint32_t v_rep_count;
-    } s_init_dynamic_huffman[1];
+    } s_init_dynamic_huffman;
     struct {
       uint32_t v_bits;
       uint32_t v_n_bits;
@@ -8269,7 +8765,7 @@
       uint32_t v_length;
       uint32_t v_dist_minus_1;
       uint64_t scratch;
-    } s_decode_huffman_slow[1];
+    } s_decode_huffman_slow;
   } private_data;
 
 #ifdef __cplusplus
@@ -8353,9 +8849,9 @@
     return wuffs_deflate__decoder__set_quirk(this, a_key, a_value);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_deflate__decoder__history_retain_length(this);
+  inline wuffs_base__optional_u63
+  dst_history_retain_length() const {
+    return wuffs_deflate__decoder__dst_history_retain_length(this);
   }
 
   inline wuffs_base__range_ii_u64
@@ -8393,23 +8889,21 @@
 
 // ---------------- Public Consts
 
-#define WUFFS_GIF__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0
+#define WUFFS_GIF__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u
 
-#define WUFFS_GIF__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
+#define WUFFS_GIF__QUIRK_DELAY_NUM_DECODED_FRAMES 1041635328u
 
-#define WUFFS_GIF__QUIRK_DELAY_NUM_DECODED_FRAMES 1041635328
+#define WUFFS_GIF__QUIRK_FIRST_FRAME_LOCAL_PALETTE_MEANS_BLACK_BACKGROUND 1041635329u
 
-#define WUFFS_GIF__QUIRK_FIRST_FRAME_LOCAL_PALETTE_MEANS_BLACK_BACKGROUND 1041635329
+#define WUFFS_GIF__QUIRK_HONOR_BACKGROUND_COLOR 1041635330u
 
-#define WUFFS_GIF__QUIRK_HONOR_BACKGROUND_COLOR 1041635330
+#define WUFFS_GIF__QUIRK_IGNORE_TOO_MUCH_PIXEL_DATA 1041635331u
 
-#define WUFFS_GIF__QUIRK_IGNORE_TOO_MUCH_PIXEL_DATA 1041635331
+#define WUFFS_GIF__QUIRK_IMAGE_BOUNDS_ARE_STRICT 1041635332u
 
-#define WUFFS_GIF__QUIRK_IMAGE_BOUNDS_ARE_STRICT 1041635332
+#define WUFFS_GIF__QUIRK_REJECT_EMPTY_FRAME 1041635333u
 
-#define WUFFS_GIF__QUIRK_REJECT_EMPTY_FRAME 1041635333
-
-#define WUFFS_GIF__QUIRK_REJECT_EMPTY_PALETTE 1041635334
+#define WUFFS_GIF__QUIRK_REJECT_EMPTY_PALETTE 1041635334u
 
 // ---------------- Struct Declarations
 
@@ -8519,11 +9013,6 @@
     const wuffs_gif__decoder* self);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_gif__decoder__history_retain_length(
-    const wuffs_gif__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
 wuffs_gif__decoder__workbuf_len(
     const wuffs_gif__decoder* self);
@@ -8627,25 +9116,25 @@
     uint32_t f_lzw_read_from_return_value;
     uint16_t f_lzw_prefixes[4096];
 
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_tell_me_more[1];
-    uint32_t p_do_tell_me_more[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_skip_frame[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
-    uint32_t p_decode_up_to_id_part1[1];
-    uint32_t p_decode_header[1];
-    uint32_t p_decode_lsd[1];
-    uint32_t p_decode_extension[1];
-    uint32_t p_skip_blocks[1];
-    uint32_t p_decode_ae[1];
-    uint32_t p_decode_gc[1];
-    uint32_t p_decode_id_part0[1];
-    uint32_t p_decode_id_part1[1];
-    uint32_t p_decode_id_part2[1];
+    uint32_t p_decode_image_config;
+    uint32_t p_do_decode_image_config;
+    uint32_t p_tell_me_more;
+    uint32_t p_do_tell_me_more;
+    uint32_t p_decode_frame_config;
+    uint32_t p_do_decode_frame_config;
+    uint32_t p_skip_frame;
+    uint32_t p_decode_frame;
+    uint32_t p_do_decode_frame;
+    uint32_t p_decode_up_to_id_part1;
+    uint32_t p_decode_header;
+    uint32_t p_decode_lsd;
+    uint32_t p_decode_extension;
+    uint32_t p_skip_blocks;
+    uint32_t p_decode_ae;
+    uint32_t p_decode_gc;
+    uint32_t p_decode_id_part0;
+    uint32_t p_decode_id_part1;
+    uint32_t p_decode_id_part2;
   } private_impl;
 
   struct {
@@ -8658,24 +9147,23 @@
 
     struct {
       uint32_t v_background_color;
-    } s_do_decode_frame_config[1];
+    } s_do_decode_frame_config;
     struct {
       uint64_t scratch;
-    } s_skip_frame[1];
+    } s_skip_frame;
     struct {
-      uint8_t v_c[6];
-      uint32_t v_i;
-    } s_decode_header[1];
+      uint64_t scratch;
+    } s_decode_header;
     struct {
       uint8_t v_flags;
       uint8_t v_background_color_index;
       uint32_t v_num_palette_entries;
       uint32_t v_i;
       uint64_t scratch;
-    } s_decode_lsd[1];
+    } s_decode_lsd;
     struct {
       uint64_t scratch;
-    } s_skip_blocks[1];
+    } s_skip_blocks;
     struct {
       uint8_t v_block_size;
       bool v_is_animexts;
@@ -8683,24 +9171,24 @@
       bool v_is_iccp;
       bool v_is_xmp;
       uint64_t scratch;
-    } s_decode_ae[1];
+    } s_decode_ae;
     struct {
       uint64_t scratch;
-    } s_decode_gc[1];
+    } s_decode_gc;
     struct {
       uint64_t scratch;
-    } s_decode_id_part0[1];
+    } s_decode_id_part0;
     struct {
       uint8_t v_which_palette;
       uint32_t v_num_palette_entries;
       uint32_t v_i;
       uint64_t scratch;
-    } s_decode_id_part1[1];
+    } s_decode_id_part1;
     struct {
       uint64_t v_block_size;
       bool v_need_block_size;
       uint64_t scratch;
-    } s_decode_id_part2[1];
+    } s_decode_id_part2;
   } private_data;
 
 #ifdef __cplusplus
@@ -8820,11 +9308,6 @@
     return wuffs_gif__decoder__frame_dirty_rect(this);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_gif__decoder__history_retain_length(this);
-  }
-
   inline wuffs_base__range_ii_u64
   workbuf_len() const {
     return wuffs_gif__decoder__workbuf_len(this);
@@ -8873,9 +9356,9 @@
 
 // ---------------- Public Consts
 
-#define WUFFS_GZIP__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0
+#define WUFFS_GZIP__DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u
 
-#define WUFFS_GZIP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 1
+#define WUFFS_GZIP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 1u
 
 // ---------------- Struct Declarations
 
@@ -8943,8 +9426,8 @@
     uint64_t a_value);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_gzip__decoder__history_retain_length(
+WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63
+wuffs_gzip__decoder__dst_history_retain_length(
     const wuffs_gzip__decoder* self);
 
 WUFFS_BASE__GENERATED_C_CODE
@@ -8989,8 +9472,8 @@
 
     bool f_ignore_checksum;
 
-    uint32_t p_transform_io[1];
-    uint32_t p_do_transform_io[1];
+    uint32_t p_transform_io;
+    uint32_t p_do_transform_io;
   } private_impl;
 
   struct {
@@ -8999,11 +9482,11 @@
 
     struct {
       uint8_t v_flags;
-      uint32_t v_checksum_got;
-      uint32_t v_decoded_length_got;
+      uint32_t v_checksum_have;
+      uint32_t v_decoded_length_have;
       uint32_t v_checksum_want;
       uint64_t scratch;
-    } s_do_transform_io[1];
+    } s_do_transform_io;
   } private_data;
 
 #ifdef __cplusplus
@@ -9081,9 +9564,9 @@
     return wuffs_gzip__decoder__set_quirk(this, a_key, a_value);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_gzip__decoder__history_retain_length(this);
+  inline wuffs_base__optional_u63
+  dst_history_retain_length() const {
+    return wuffs_gzip__decoder__dst_history_retain_length(this);
   }
 
   inline wuffs_base__range_ii_u64
@@ -9134,9 +9617,7 @@
 
 // ---------------- Public Consts
 
-#define WUFFS_JPEG__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0
-
-#define WUFFS_JPEG__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 51552191232
+#define WUFFS_JPEG__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 51552191232u
 
 // ---------------- Struct Declarations
 
@@ -9270,11 +9751,6 @@
     wuffs_base__io_buffer* a_src);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_jpeg__decoder__history_retain_length(
-    const wuffs_jpeg__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
 wuffs_jpeg__decoder__workbuf_len(
     const wuffs_jpeg__decoder* self);
@@ -9381,26 +9857,26 @@
         wuffs_base__slice_u8 a_dst_buffer,
         uint64_t a_dst_stride,
         uint32_t a_q);
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_decode_dqt[1];
-    uint32_t p_decode_dri[1];
-    uint32_t p_decode_appn[1];
-    uint32_t p_decode_sof[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
-    uint32_t p_decode_dht[1];
-    uint32_t p_decode_sos[1];
-    uint32_t p_prepare_scan[1];
+    uint32_t p_decode_image_config;
+    uint32_t p_do_decode_image_config;
+    uint32_t p_decode_dqt;
+    uint32_t p_decode_dri;
+    uint32_t p_decode_appn;
+    uint32_t p_decode_sof;
+    uint32_t p_decode_frame_config;
+    uint32_t p_do_decode_frame_config;
+    uint32_t p_decode_frame;
+    uint32_t p_do_decode_frame;
+    uint32_t p_decode_dht;
+    uint32_t p_decode_sos;
+    uint32_t p_prepare_scan;
     wuffs_base__empty_struct (*choosy_load_mcu_blocks_for_single_component)(
         wuffs_jpeg__decoder* self,
         uint32_t a_mx,
         uint32_t a_my,
         wuffs_base__slice_u8 a_workbuf,
         uint32_t a_csel);
-    uint32_t p_skip_past_the_next_restart_marker[1];
+    uint32_t p_skip_past_the_next_restart_marker;
     uint32_t (*choosy_decode_mcu)(
         wuffs_jpeg__decoder* self,
         wuffs_base__slice_u8 a_workbuf,
@@ -9420,38 +9896,38 @@
     struct {
       uint8_t v_marker;
       uint64_t scratch;
-    } s_do_decode_image_config[1];
+    } s_do_decode_image_config;
     struct {
       uint8_t v_q;
       uint32_t v_i;
-    } s_decode_dqt[1];
+    } s_decode_dqt;
     struct {
       uint64_t scratch;
-    } s_decode_dri[1];
+    } s_decode_dri;
     struct {
       uint64_t scratch;
-    } s_decode_appn[1];
+    } s_decode_appn;
     struct {
       uint32_t v_i;
       uint64_t scratch;
-    } s_decode_sof[1];
+    } s_decode_sof;
     struct {
       uint8_t v_marker;
       uint64_t scratch;
-    } s_do_decode_frame[1];
+    } s_do_decode_frame;
     struct {
       uint8_t v_tc4_th;
       uint32_t v_total_count;
       uint32_t v_i;
-    } s_decode_dht[1];
+    } s_decode_dht;
     struct {
       uint32_t v_my;
       uint32_t v_mx;
-    } s_decode_sos[1];
+    } s_decode_sos;
     struct {
       uint32_t v_i;
       uint64_t scratch;
-    } s_prepare_scan[1];
+    } s_prepare_scan;
   } private_data;
 
 #ifdef __cplusplus
@@ -9595,11 +10071,6 @@
     return wuffs_jpeg__decoder__tell_me_more(this, a_dst, a_minfo, a_src);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_jpeg__decoder__history_retain_length(this);
-  }
-
   inline wuffs_base__range_ii_u64
   workbuf_len() const {
     return wuffs_jpeg__decoder__workbuf_len(this);
@@ -9627,55 +10098,53 @@
 
 // ---------------- Public Consts
 
-#define WUFFS_JSON__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0
+#define WUFFS_JSON__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u
 
-#define WUFFS_JSON__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
+#define WUFFS_JSON__DECODER_DEPTH_MAX_INCL 1024u
 
-#define WUFFS_JSON__DECODER_DEPTH_MAX_INCL 1024
+#define WUFFS_JSON__DECODER_DST_TOKEN_BUFFER_LENGTH_MIN_INCL 1u
 
-#define WUFFS_JSON__DECODER_DST_TOKEN_BUFFER_LENGTH_MIN_INCL 1
+#define WUFFS_JSON__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL 100u
 
-#define WUFFS_JSON__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL 100
+#define WUFFS_JSON__QUIRK_ALLOW_ASCII_CONTROL_CODES 1225364480u
 
-#define WUFFS_JSON__QUIRK_ALLOW_ASCII_CONTROL_CODES 1225364480
+#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_A 1225364481u
 
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_A 1225364481
+#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_CAPITAL_U 1225364482u
 
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_CAPITAL_U 1225364482
+#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_E 1225364483u
 
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_E 1225364483
+#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_NEW_LINE 1225364484u
 
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_NEW_LINE 1225364484
+#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_QUESTION_MARK 1225364485u
 
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_QUESTION_MARK 1225364485
+#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_SINGLE_QUOTE 1225364486u
 
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_SINGLE_QUOTE 1225364486
+#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_V 1225364487u
 
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_V 1225364487
+#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_X_AS_CODE_POINTS 1225364489u
 
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_X_AS_CODE_POINTS 1225364489
+#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_ZERO 1225364490u
 
-#define WUFFS_JSON__QUIRK_ALLOW_BACKSLASH_ZERO 1225364490
+#define WUFFS_JSON__QUIRK_ALLOW_COMMENT_BLOCK 1225364491u
 
-#define WUFFS_JSON__QUIRK_ALLOW_COMMENT_BLOCK 1225364491
+#define WUFFS_JSON__QUIRK_ALLOW_COMMENT_LINE 1225364492u
 
-#define WUFFS_JSON__QUIRK_ALLOW_COMMENT_LINE 1225364492
+#define WUFFS_JSON__QUIRK_ALLOW_EXTRA_COMMA 1225364493u
 
-#define WUFFS_JSON__QUIRK_ALLOW_EXTRA_COMMA 1225364493
+#define WUFFS_JSON__QUIRK_ALLOW_INF_NAN_NUMBERS 1225364494u
 
-#define WUFFS_JSON__QUIRK_ALLOW_INF_NAN_NUMBERS 1225364494
+#define WUFFS_JSON__QUIRK_ALLOW_LEADING_ASCII_RECORD_SEPARATOR 1225364495u
 
-#define WUFFS_JSON__QUIRK_ALLOW_LEADING_ASCII_RECORD_SEPARATOR 1225364495
+#define WUFFS_JSON__QUIRK_ALLOW_LEADING_UNICODE_BYTE_ORDER_MARK 1225364496u
 
-#define WUFFS_JSON__QUIRK_ALLOW_LEADING_UNICODE_BYTE_ORDER_MARK 1225364496
+#define WUFFS_JSON__QUIRK_ALLOW_TRAILING_FILLER 1225364497u
 
-#define WUFFS_JSON__QUIRK_ALLOW_TRAILING_FILLER 1225364497
+#define WUFFS_JSON__QUIRK_EXPECT_TRAILING_NEW_LINE_OR_EOF 1225364498u
 
-#define WUFFS_JSON__QUIRK_EXPECT_TRAILING_NEW_LINE_OR_EOF 1225364498
+#define WUFFS_JSON__QUIRK_JSON_POINTER_ALLOW_TILDE_N_TILDE_R_TILDE_T 1225364499u
 
-#define WUFFS_JSON__QUIRK_JSON_POINTER_ALLOW_TILDE_N_TILDE_R_TILDE_T 1225364499
-
-#define WUFFS_JSON__QUIRK_REPLACE_INVALID_UNICODE 1225364500
+#define WUFFS_JSON__QUIRK_REPLACE_INVALID_UNICODE 1225364500u
 
 // ---------------- Struct Declarations
 
@@ -9743,11 +10212,6 @@
     uint64_t a_value);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_json__decoder__history_retain_length(
-    const wuffs_json__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
 wuffs_json__decoder__workbuf_len(
     const wuffs_json__decoder* self);
@@ -9794,11 +10258,11 @@
     uint8_t f_trailer_stop;
     uint8_t f_comment_type;
 
-    uint32_t p_decode_tokens[1];
-    uint32_t p_decode_leading[1];
-    uint32_t p_decode_comment[1];
-    uint32_t p_decode_inf_nan[1];
-    uint32_t p_decode_trailer[1];
+    uint32_t p_decode_tokens;
+    uint32_t p_decode_leading;
+    uint32_t p_decode_comment;
+    uint32_t p_decode_inf_nan;
+    uint32_t p_decode_trailer;
   } private_impl;
 
   struct {
@@ -9808,7 +10272,7 @@
       uint32_t v_depth;
       uint32_t v_expect;
       uint32_t v_expect_after_value;
-    } s_decode_tokens[1];
+    } s_decode_tokens;
   } private_data;
 
 #ifdef __cplusplus
@@ -9886,11 +10350,6 @@
     return wuffs_json__decoder__set_quirk(this, a_key, a_value);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_json__decoder__history_retain_length(this);
-  }
-
   inline wuffs_base__range_ii_u64
   workbuf_len() const {
     return wuffs_json__decoder__workbuf_len(this);
@@ -9911,6 +10370,574 @@
 
 #endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__JSON) || defined(WUFFS_NONMONOLITHIC)
 
+#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZMA) || defined(WUFFS_NONMONOLITHIC)
+
+// ---------------- Status Codes
+
+extern const char wuffs_lzma__error__bad_lzma2_header[];
+extern const char wuffs_lzma__error__bad_bitstream_trailer[];
+extern const char wuffs_lzma__error__bad_code[];
+extern const char wuffs_lzma__error__bad_decoded_length[];
+extern const char wuffs_lzma__error__bad_distance[];
+extern const char wuffs_lzma__error__bad_header[];
+extern const char wuffs_lzma__error__truncated_input[];
+extern const char wuffs_lzma__error__unsupported_decoded_length[];
+extern const char wuffs_lzma__error__unsupported_properties[];
+
+// ---------------- Public Consts
+
+#define WUFFS_LZMA__DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u
+
+#define WUFFS_LZMA__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 4294967568u
+
+#define WUFFS_LZMA__QUIRK_ALLOW_NON_ZERO_INITIAL_BYTE 1348001792u
+
+#define WUFFS_LZMA__QUIRK_FORMAT_EXTENSION 1348001793u
+
+// ---------------- Struct Declarations
+
+typedef struct wuffs_lzma__decoder__struct wuffs_lzma__decoder;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// ---------------- Public Initializer Prototypes
+
+// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
+// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
+//
+// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
+// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
+
+wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
+wuffs_lzma__decoder__initialize(
+    wuffs_lzma__decoder* self,
+    size_t sizeof_star_self,
+    uint64_t wuffs_version,
+    uint32_t options);
+
+size_t
+sizeof__wuffs_lzma__decoder(void);
+
+// ---------------- Allocs
+
+// These functions allocate and initialize Wuffs structs. They return NULL if
+// memory allocation fails. If they return non-NULL, there is no need to call
+// wuffs_foo__bar__initialize, but the caller is responsible for eventually
+// calling free on the returned pointer. That pointer is effectively a C++
+// std::unique_ptr<T, wuffs_unique_ptr_deleter>.
+
+wuffs_lzma__decoder*
+wuffs_lzma__decoder__alloc(void);
+
+static inline wuffs_base__io_transformer*
+wuffs_lzma__decoder__alloc_as__wuffs_base__io_transformer(void) {
+  return (wuffs_base__io_transformer*)(wuffs_lzma__decoder__alloc());
+}
+
+// ---------------- Upcasts
+
+static inline wuffs_base__io_transformer*
+wuffs_lzma__decoder__upcast_as__wuffs_base__io_transformer(
+    wuffs_lzma__decoder* p) {
+  return (wuffs_base__io_transformer*)p;
+}
+
+// ---------------- Public Function Prototypes
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC uint64_t
+wuffs_lzma__decoder__get_quirk(
+    const wuffs_lzma__decoder* self,
+    uint32_t a_key);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__status
+wuffs_lzma__decoder__set_quirk(
+    wuffs_lzma__decoder* self,
+    uint32_t a_key,
+    uint64_t a_value);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63
+wuffs_lzma__decoder__dst_history_retain_length(
+    const wuffs_lzma__decoder* self);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
+wuffs_lzma__decoder__workbuf_len(
+    const wuffs_lzma__decoder* self);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__status
+wuffs_lzma__decoder__transform_io(
+    wuffs_lzma__decoder* self,
+    wuffs_base__io_buffer* a_dst,
+    wuffs_base__io_buffer* a_src,
+    wuffs_base__slice_u8 a_workbuf);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+// ---------------- Struct Definitions
+
+// These structs' fields, and the sizeof them, are private implementation
+// details that aren't guaranteed to be stable across Wuffs versions.
+//
+// See https://en.wikipedia.org/wiki/Opaque_pointer#C
+
+#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
+
+struct wuffs_lzma__decoder__struct {
+  // Do not access the private_impl's or private_data's fields directly. There
+  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
+  // the wuffs_foo__bar__baz functions.
+  //
+  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
+  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
+
+  struct {
+    uint32_t magic;
+    uint32_t active_coroutine;
+    wuffs_base__vtable vtable_for__wuffs_base__io_transformer;
+    wuffs_base__vtable null_vtable;
+
+    uint32_t f_lc;
+    uint32_t f_lp;
+    uint32_t f_pb;
+    uint32_t f_format_extension;
+    uint32_t f_dict_size;
+    uint32_t f_dict_workbuf_index;
+    uint32_t f_dict_seen;
+    uint64_t f_decoded_length;
+    uint64_t f_lzma2_encoded_length_have;
+    uint64_t f_lzma2_encoded_length_want;
+    bool f_lzma2_need_prob_reset;
+    bool f_lzma2_need_properties;
+    bool f_lzma2_need_dict_reset;
+    bool f_prev_lzma2_chunk_was_uncompressed;
+    bool f_allow_non_zero_initial_byte;
+    bool f_end_of_chunk;
+    uint8_t f_stashed_bytes[2];
+    uint32_t f_stashed_bits;
+    uint32_t f_stashed_range;
+    uint32_t f_stashed_state;
+    uint32_t f_stashed_rep0;
+    uint32_t f_stashed_rep1;
+    uint32_t f_stashed_rep2;
+    uint32_t f_stashed_rep3;
+    uint64_t f_stashed_pos;
+    uint64_t f_stashed_pos_end;
+
+    uint32_t p_decode_bitstream_slow;
+    uint32_t p_transform_io;
+    uint32_t p_do_transform_io;
+    uint32_t p_decode_bitstream;
+    uint32_t p_update_stashed_bytes;
+    uint32_t p_decode_optional_end_of_stream;
+  } private_impl;
+
+  struct {
+    uint16_t f_probs_ao00[192];
+    uint16_t f_probs_ao20[12];
+    uint16_t f_probs_ao40[12];
+    uint16_t f_probs_ao41[192];
+    uint16_t f_probs_ao60[12];
+    uint16_t f_probs_ao63[12];
+    uint16_t f_probs_match_len_low[16][8];
+    uint16_t f_probs_match_len_mid[16][8];
+    uint16_t f_probs_match_len_high[1][256];
+    uint16_t f_probs_longrep_len_low[16][8];
+    uint16_t f_probs_longrep_len_mid[16][8];
+    uint16_t f_probs_longrep_len_high[1][256];
+    uint16_t f_probs_slot[4][64];
+    uint16_t f_probs_small_dist[128];
+    uint16_t f_probs_large_dist[16];
+    uint16_t f_probs_lit[16][768];
+
+    struct {
+      uint32_t v_bits;
+      uint32_t v_range;
+      uint32_t v_state;
+      uint32_t v_rep0;
+      uint32_t v_rep1;
+      uint32_t v_rep2;
+      uint32_t v_rep3;
+      uint32_t v_rep;
+      uint64_t v_pos;
+      uint64_t v_pos_end;
+      uint32_t v_lc;
+      uint64_t v_lp_mask;
+      uint64_t v_pb_mask;
+      uint32_t v_tree_node;
+      uint8_t v_prev_byte;
+      uint32_t v_match_byte;
+      uint32_t v_len_state;
+      uint32_t v_slot;
+      uint32_t v_len;
+      uint32_t v_lanl_offset;
+      uint32_t v_num_extra_bits;
+      uint32_t v_dist_extra_bits;
+      uint32_t v_i;
+      uint32_t v_index_lit;
+      uint32_t v_index_len;
+      uint32_t v_index_small_dist_base;
+      uint32_t v_index_small_dist_extra;
+      uint32_t v_index_large_dist;
+      uint32_t v_dist;
+      uint64_t scratch;
+    } s_decode_bitstream_slow;
+    struct {
+      uint8_t v_header_byte;
+      uint32_t v_length;
+      uint64_t scratch;
+    } s_do_transform_io;
+  } private_data;
+
+#ifdef __cplusplus
+#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
+  using unique_ptr = std::unique_ptr<wuffs_lzma__decoder, wuffs_unique_ptr_deleter>;
+
+  // On failure, the alloc_etc functions return nullptr. They don't throw.
+
+  static inline unique_ptr
+  alloc() {
+    return unique_ptr(wuffs_lzma__decoder__alloc());
+  }
+
+  static inline wuffs_base__io_transformer::unique_ptr
+  alloc_as__wuffs_base__io_transformer() {
+    return wuffs_base__io_transformer::unique_ptr(
+        wuffs_lzma__decoder__alloc_as__wuffs_base__io_transformer());
+  }
+#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
+
+#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
+  // Disallow constructing or copying an object via standard C++ mechanisms,
+  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
+  // size and field layout is not part of the public, stable, memory-safe API.
+  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
+  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
+  // their first argument) rather than tweaking bar.private_impl.qux fields.
+  //
+  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
+  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
+  // order to provide convenience methods. These forward on "this", so that you
+  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
+  wuffs_lzma__decoder__struct() = delete;
+  wuffs_lzma__decoder__struct(const wuffs_lzma__decoder__struct&) = delete;
+  wuffs_lzma__decoder__struct& operator=(
+      const wuffs_lzma__decoder__struct&) = delete;
+#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
+
+#if !defined(WUFFS_IMPLEMENTATION)
+  // As above, the size of the struct is not part of the public API, and unless
+  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
+  // allocated, not stack allocated. Its size is not intended to be known at
+  // compile time, but it is unfortunately divulged as a side effect of
+  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
+  // instead of "sizeof T", invoking the operator. To make the two values
+  // different, so that passing the latter will be rejected by the initialize
+  // function, we add an arbitrary amount of dead weight.
+  uint8_t dead_weight[123000000];  // 123 MB.
+#endif  // !defined(WUFFS_IMPLEMENTATION)
+
+  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
+  initialize(
+      size_t sizeof_star_self,
+      uint64_t wuffs_version,
+      uint32_t options) {
+    return wuffs_lzma__decoder__initialize(
+        this, sizeof_star_self, wuffs_version, options);
+  }
+
+  inline wuffs_base__io_transformer*
+  upcast_as__wuffs_base__io_transformer() {
+    return (wuffs_base__io_transformer*)this;
+  }
+
+  inline uint64_t
+  get_quirk(
+      uint32_t a_key) const {
+    return wuffs_lzma__decoder__get_quirk(this, a_key);
+  }
+
+  inline wuffs_base__status
+  set_quirk(
+      uint32_t a_key,
+      uint64_t a_value) {
+    return wuffs_lzma__decoder__set_quirk(this, a_key, a_value);
+  }
+
+  inline wuffs_base__optional_u63
+  dst_history_retain_length() const {
+    return wuffs_lzma__decoder__dst_history_retain_length(this);
+  }
+
+  inline wuffs_base__range_ii_u64
+  workbuf_len() const {
+    return wuffs_lzma__decoder__workbuf_len(this);
+  }
+
+  inline wuffs_base__status
+  transform_io(
+      wuffs_base__io_buffer* a_dst,
+      wuffs_base__io_buffer* a_src,
+      wuffs_base__slice_u8 a_workbuf) {
+    return wuffs_lzma__decoder__transform_io(this, a_dst, a_src, a_workbuf);
+  }
+
+#endif  // __cplusplus
+};  // struct wuffs_lzma__decoder__struct
+
+#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
+
+#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZMA) || defined(WUFFS_NONMONOLITHIC)
+
+#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZIP) || defined(WUFFS_NONMONOLITHIC)
+
+// ---------------- Status Codes
+
+extern const char wuffs_lzip__error__bad_checksum[];
+extern const char wuffs_lzip__error__bad_footer[];
+extern const char wuffs_lzip__error__bad_header[];
+extern const char wuffs_lzip__error__truncated_input[];
+
+// ---------------- Public Consts
+
+#define WUFFS_LZIP__DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u
+
+#define WUFFS_LZIP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 4294967568u
+
+// ---------------- Struct Declarations
+
+typedef struct wuffs_lzip__decoder__struct wuffs_lzip__decoder;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// ---------------- Public Initializer Prototypes
+
+// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
+// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
+//
+// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
+// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
+
+wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
+wuffs_lzip__decoder__initialize(
+    wuffs_lzip__decoder* self,
+    size_t sizeof_star_self,
+    uint64_t wuffs_version,
+    uint32_t options);
+
+size_t
+sizeof__wuffs_lzip__decoder(void);
+
+// ---------------- Allocs
+
+// These functions allocate and initialize Wuffs structs. They return NULL if
+// memory allocation fails. If they return non-NULL, there is no need to call
+// wuffs_foo__bar__initialize, but the caller is responsible for eventually
+// calling free on the returned pointer. That pointer is effectively a C++
+// std::unique_ptr<T, wuffs_unique_ptr_deleter>.
+
+wuffs_lzip__decoder*
+wuffs_lzip__decoder__alloc(void);
+
+static inline wuffs_base__io_transformer*
+wuffs_lzip__decoder__alloc_as__wuffs_base__io_transformer(void) {
+  return (wuffs_base__io_transformer*)(wuffs_lzip__decoder__alloc());
+}
+
+// ---------------- Upcasts
+
+static inline wuffs_base__io_transformer*
+wuffs_lzip__decoder__upcast_as__wuffs_base__io_transformer(
+    wuffs_lzip__decoder* p) {
+  return (wuffs_base__io_transformer*)p;
+}
+
+// ---------------- Public Function Prototypes
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC uint64_t
+wuffs_lzip__decoder__get_quirk(
+    const wuffs_lzip__decoder* self,
+    uint32_t a_key);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__status
+wuffs_lzip__decoder__set_quirk(
+    wuffs_lzip__decoder* self,
+    uint32_t a_key,
+    uint64_t a_value);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63
+wuffs_lzip__decoder__dst_history_retain_length(
+    const wuffs_lzip__decoder* self);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
+wuffs_lzip__decoder__workbuf_len(
+    const wuffs_lzip__decoder* self);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__status
+wuffs_lzip__decoder__transform_io(
+    wuffs_lzip__decoder* self,
+    wuffs_base__io_buffer* a_dst,
+    wuffs_base__io_buffer* a_src,
+    wuffs_base__slice_u8 a_workbuf);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+// ---------------- Struct Definitions
+
+// These structs' fields, and the sizeof them, are private implementation
+// details that aren't guaranteed to be stable across Wuffs versions.
+//
+// See https://en.wikipedia.org/wiki/Opaque_pointer#C
+
+#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
+
+struct wuffs_lzip__decoder__struct {
+  // Do not access the private_impl's or private_data's fields directly. There
+  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
+  // the wuffs_foo__bar__baz functions.
+  //
+  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
+  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
+
+  struct {
+    uint32_t magic;
+    uint32_t active_coroutine;
+    wuffs_base__vtable vtable_for__wuffs_base__io_transformer;
+    wuffs_base__vtable null_vtable;
+
+    bool f_ignore_checksum;
+    uint64_t f_dsize_have;
+    uint64_t f_ssize_have;
+
+    uint32_t p_transform_io;
+    uint32_t p_do_transform_io;
+  } private_impl;
+
+  struct {
+    wuffs_crc32__ieee_hasher f_crc32;
+    wuffs_lzma__decoder f_lzma;
+
+    struct {
+      uint64_t scratch;
+    } s_do_transform_io;
+  } private_data;
+
+#ifdef __cplusplus
+#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
+  using unique_ptr = std::unique_ptr<wuffs_lzip__decoder, wuffs_unique_ptr_deleter>;
+
+  // On failure, the alloc_etc functions return nullptr. They don't throw.
+
+  static inline unique_ptr
+  alloc() {
+    return unique_ptr(wuffs_lzip__decoder__alloc());
+  }
+
+  static inline wuffs_base__io_transformer::unique_ptr
+  alloc_as__wuffs_base__io_transformer() {
+    return wuffs_base__io_transformer::unique_ptr(
+        wuffs_lzip__decoder__alloc_as__wuffs_base__io_transformer());
+  }
+#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
+
+#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
+  // Disallow constructing or copying an object via standard C++ mechanisms,
+  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
+  // size and field layout is not part of the public, stable, memory-safe API.
+  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
+  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
+  // their first argument) rather than tweaking bar.private_impl.qux fields.
+  //
+  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
+  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
+  // order to provide convenience methods. These forward on "this", so that you
+  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
+  wuffs_lzip__decoder__struct() = delete;
+  wuffs_lzip__decoder__struct(const wuffs_lzip__decoder__struct&) = delete;
+  wuffs_lzip__decoder__struct& operator=(
+      const wuffs_lzip__decoder__struct&) = delete;
+#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
+
+#if !defined(WUFFS_IMPLEMENTATION)
+  // As above, the size of the struct is not part of the public API, and unless
+  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
+  // allocated, not stack allocated. Its size is not intended to be known at
+  // compile time, but it is unfortunately divulged as a side effect of
+  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
+  // instead of "sizeof T", invoking the operator. To make the two values
+  // different, so that passing the latter will be rejected by the initialize
+  // function, we add an arbitrary amount of dead weight.
+  uint8_t dead_weight[123000000];  // 123 MB.
+#endif  // !defined(WUFFS_IMPLEMENTATION)
+
+  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
+  initialize(
+      size_t sizeof_star_self,
+      uint64_t wuffs_version,
+      uint32_t options) {
+    return wuffs_lzip__decoder__initialize(
+        this, sizeof_star_self, wuffs_version, options);
+  }
+
+  inline wuffs_base__io_transformer*
+  upcast_as__wuffs_base__io_transformer() {
+    return (wuffs_base__io_transformer*)this;
+  }
+
+  inline uint64_t
+  get_quirk(
+      uint32_t a_key) const {
+    return wuffs_lzip__decoder__get_quirk(this, a_key);
+  }
+
+  inline wuffs_base__status
+  set_quirk(
+      uint32_t a_key,
+      uint64_t a_value) {
+    return wuffs_lzip__decoder__set_quirk(this, a_key, a_value);
+  }
+
+  inline wuffs_base__optional_u63
+  dst_history_retain_length() const {
+    return wuffs_lzip__decoder__dst_history_retain_length(this);
+  }
+
+  inline wuffs_base__range_ii_u64
+  workbuf_len() const {
+    return wuffs_lzip__decoder__workbuf_len(this);
+  }
+
+  inline wuffs_base__status
+  transform_io(
+      wuffs_base__io_buffer* a_dst,
+      wuffs_base__io_buffer* a_src,
+      wuffs_base__slice_u8 a_workbuf) {
+    return wuffs_lzip__decoder__transform_io(this, a_dst, a_src, a_workbuf);
+  }
+
+#endif  // __cplusplus
+};  // struct wuffs_lzip__decoder__struct
+
+#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
+
+#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZIP) || defined(WUFFS_NONMONOLITHIC)
+
 #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__LZW) || defined(WUFFS_NONMONOLITHIC)
 
 // ---------------- Status Codes
@@ -9920,11 +10947,11 @@
 
 // ---------------- Public Consts
 
-#define WUFFS_LZW__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0
+#define WUFFS_LZW__DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u
 
-#define WUFFS_LZW__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
+#define WUFFS_LZW__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u
 
-#define WUFFS_LZW__QUIRK_LITERAL_WIDTH_PLUS_ONE 1348378624
+#define WUFFS_LZW__QUIRK_LITERAL_WIDTH_PLUS_ONE 1348378624u
 
 // ---------------- Struct Declarations
 
@@ -9992,8 +11019,8 @@
     uint64_t a_value);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_lzw__decoder__history_retain_length(
+WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63
+wuffs_lzw__decoder__dst_history_retain_length(
     const wuffs_lzw__decoder* self);
 
 WUFFS_BASE__GENERATED_C_CODE
@@ -10055,8 +11082,8 @@
     uint32_t f_read_from_return_value;
     uint16_t f_prefixes[4096];
 
-    uint32_t p_transform_io[1];
-    uint32_t p_write_to[1];
+    uint32_t p_transform_io;
+    uint32_t p_write_to;
   } private_impl;
 
   struct {
@@ -10140,9 +11167,9 @@
     return wuffs_lzw__decoder__set_quirk(this, a_key, a_value);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_lzw__decoder__history_retain_length(this);
+  inline wuffs_base__optional_u63
+  dst_history_retain_length() const {
+    return wuffs_lzw__decoder__dst_history_retain_length(this);
   }
 
   inline wuffs_base__range_ii_u64
@@ -10180,9 +11207,7 @@
 
 // ---------------- Public Consts
 
-#define WUFFS_NETPBM__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0
-
-#define WUFFS_NETPBM__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
+#define WUFFS_NETPBM__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u
 
 // ---------------- Struct Declarations
 
@@ -10316,11 +11341,6 @@
     wuffs_base__io_buffer* a_src);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_netpbm__decoder__history_retain_length(
-    const wuffs_netpbm__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
 wuffs_netpbm__decoder__workbuf_len(
     const wuffs_netpbm__decoder* self);
@@ -10362,12 +11382,12 @@
     uint32_t f_dst_y;
     wuffs_base__pixel_swizzler f_swizzler;
 
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
+    uint32_t p_decode_image_config;
+    uint32_t p_do_decode_image_config;
+    uint32_t p_decode_frame_config;
+    uint32_t p_do_decode_frame_config;
+    uint32_t p_decode_frame;
+    uint32_t p_do_decode_frame;
   } private_impl;
 
 #ifdef __cplusplus
@@ -10511,11 +11531,6 @@
     return wuffs_netpbm__decoder__tell_me_more(this, a_dst, a_minfo, a_src);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_netpbm__decoder__history_retain_length(this);
-  }
-
   inline wuffs_base__range_ii_u64
   workbuf_len() const {
     return wuffs_netpbm__decoder__workbuf_len(this);
@@ -10538,9 +11553,7 @@
 
 // ---------------- Public Consts
 
-#define WUFFS_NIE__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0
-
-#define WUFFS_NIE__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
+#define WUFFS_NIE__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u
 
 // ---------------- Struct Declarations
 
@@ -10674,11 +11687,6 @@
     wuffs_base__io_buffer* a_src);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_nie__decoder__history_retain_length(
-    const wuffs_nie__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
 wuffs_nie__decoder__workbuf_len(
     const wuffs_nie__decoder* self);
@@ -10718,18 +11726,18 @@
     uint32_t f_dst_y;
     wuffs_base__pixel_swizzler f_swizzler;
 
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
+    uint32_t p_decode_image_config;
+    uint32_t p_do_decode_image_config;
+    uint32_t p_decode_frame_config;
+    uint32_t p_do_decode_frame_config;
+    uint32_t p_decode_frame;
+    uint32_t p_do_decode_frame;
   } private_impl;
 
   struct {
     struct {
       uint64_t scratch;
-    } s_do_decode_image_config[1];
+    } s_do_decode_image_config;
   } private_data;
 
 #ifdef __cplusplus
@@ -10873,11 +11881,6 @@
     return wuffs_nie__decoder__tell_me_more(this, a_dst, a_minfo, a_src);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_nie__decoder__history_retain_length(this);
-  }
-
   inline wuffs_base__range_ii_u64
   workbuf_len() const {
     return wuffs_nie__decoder__workbuf_len(this);
@@ -10904,11 +11907,11 @@
 
 // ---------------- Public Consts
 
-#define WUFFS_ZLIB__QUIRK_JUST_RAW_DEFLATE 2113790976
+#define WUFFS_ZLIB__QUIRK_JUST_RAW_DEFLATE 2113790976u
 
-#define WUFFS_ZLIB__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0
+#define WUFFS_ZLIB__DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u
 
-#define WUFFS_ZLIB__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 1
+#define WUFFS_ZLIB__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 1u
 
 // ---------------- Struct Declarations
 
@@ -10987,8 +11990,8 @@
     uint64_t a_value);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_zlib__decoder__history_retain_length(
+WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63
+wuffs_zlib__decoder__dst_history_retain_length(
     const wuffs_zlib__decoder* self);
 
 WUFFS_BASE__GENERATED_C_CODE
@@ -11037,11 +12040,11 @@
     bool f_want_dictionary;
     bool f_quirks[1];
     bool f_ignore_checksum;
-    uint32_t f_dict_id_got;
+    uint32_t f_dict_id_have;
     uint32_t f_dict_id_want;
 
-    uint32_t p_transform_io[1];
-    uint32_t p_do_transform_io[1];
+    uint32_t p_transform_io;
+    uint32_t p_do_transform_io;
   } private_impl;
 
   struct {
@@ -11050,9 +12053,9 @@
     wuffs_deflate__decoder f_flate;
 
     struct {
-      uint32_t v_checksum_got;
+      uint32_t v_checksum_have;
       uint64_t scratch;
-    } s_do_transform_io[1];
+    } s_do_transform_io;
   } private_data;
 
 #ifdef __cplusplus
@@ -11141,9 +12144,9 @@
     return wuffs_zlib__decoder__set_quirk(this, a_key, a_value);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_zlib__decoder__history_retain_length(this);
+  inline wuffs_base__optional_u63
+  dst_history_retain_length() const {
+    return wuffs_zlib__decoder__dst_history_retain_length(this);
   }
 
   inline wuffs_base__range_ii_u64
@@ -11184,11 +12187,9 @@
 
 // ---------------- Public Consts
 
-#define WUFFS_PNG__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0
+#define WUFFS_PNG__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 2251799562027015u
 
-#define WUFFS_PNG__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 2251799562027015
-
-#define WUFFS_PNG__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL 8
+#define WUFFS_PNG__DECODER_SRC_IO_BUFFER_LENGTH_MIN_INCL 8u
 
 // ---------------- Struct Declarations
 
@@ -11322,11 +12323,6 @@
     wuffs_base__io_buffer* a_src);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_png__decoder__history_retain_length(
-    const wuffs_png__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
 wuffs_png__decoder__workbuf_len(
     const wuffs_png__decoder* self);
@@ -11438,26 +12434,26 @@
         wuffs_png__decoder* self,
         wuffs_base__slice_u8 a_curr,
         wuffs_base__slice_u8 a_prev);
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_decode_ihdr[1];
-    uint32_t p_decode_other_chunk[1];
-    uint32_t p_decode_actl[1];
-    uint32_t p_decode_chrm[1];
-    uint32_t p_decode_fctl[1];
-    uint32_t p_decode_gama[1];
-    uint32_t p_decode_iccp[1];
-    uint32_t p_decode_plte[1];
-    uint32_t p_decode_srgb[1];
-    uint32_t p_decode_trns[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_skip_frame[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
-    uint32_t p_decode_pass[1];
-    uint32_t p_tell_me_more[1];
-    uint32_t p_do_tell_me_more[1];
+    uint32_t p_decode_image_config;
+    uint32_t p_do_decode_image_config;
+    uint32_t p_decode_ihdr;
+    uint32_t p_decode_other_chunk;
+    uint32_t p_decode_actl;
+    uint32_t p_decode_chrm;
+    uint32_t p_decode_fctl;
+    uint32_t p_decode_gama;
+    uint32_t p_decode_iccp;
+    uint32_t p_decode_plte;
+    uint32_t p_decode_srgb;
+    uint32_t p_decode_trns;
+    uint32_t p_decode_frame_config;
+    uint32_t p_do_decode_frame_config;
+    uint32_t p_skip_frame;
+    uint32_t p_decode_frame;
+    uint32_t p_do_decode_frame;
+    uint32_t p_decode_pass;
+    uint32_t p_tell_me_more;
+    uint32_t p_do_tell_me_more;
     wuffs_base__status (*choosy_filter_and_swizzle)(
         wuffs_png__decoder* self,
         wuffs_base__pixel_buffer* a_dst,
@@ -11473,54 +12469,54 @@
     struct {
       uint32_t v_checksum_have;
       uint64_t scratch;
-    } s_do_decode_image_config[1];
+    } s_do_decode_image_config;
     struct {
       uint64_t scratch;
-    } s_decode_ihdr[1];
+    } s_decode_ihdr;
     struct {
       uint64_t scratch;
-    } s_decode_other_chunk[1];
+    } s_decode_other_chunk;
     struct {
       uint64_t scratch;
-    } s_decode_actl[1];
+    } s_decode_actl;
     struct {
       uint64_t scratch;
-    } s_decode_chrm[1];
+    } s_decode_chrm;
     struct {
       uint32_t v_x0;
       uint32_t v_x1;
       uint32_t v_y1;
       uint64_t scratch;
-    } s_decode_fctl[1];
+    } s_decode_fctl;
     struct {
       uint64_t scratch;
-    } s_decode_gama[1];
+    } s_decode_gama;
     struct {
       uint32_t v_num_entries;
       uint32_t v_i;
       uint64_t scratch;
-    } s_decode_plte[1];
+    } s_decode_plte;
     struct {
       uint32_t v_i;
       uint32_t v_n;
       uint64_t scratch;
-    } s_decode_trns[1];
+    } s_decode_trns;
     struct {
       uint64_t scratch;
-    } s_do_decode_frame_config[1];
+    } s_do_decode_frame_config;
     struct {
       uint64_t scratch;
-    } s_skip_frame[1];
+    } s_skip_frame;
     struct {
       uint64_t scratch;
-    } s_do_decode_frame[1];
+    } s_do_decode_frame;
     struct {
       uint64_t scratch;
-    } s_decode_pass[1];
+    } s_decode_pass;
     struct {
       wuffs_base__status v_zlib_status;
       uint64_t scratch;
-    } s_do_tell_me_more[1];
+    } s_do_tell_me_more;
   } private_data;
 
 #ifdef __cplusplus
@@ -11664,11 +12660,6 @@
     return wuffs_png__decoder__tell_me_more(this, a_dst, a_minfo, a_src);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_png__decoder__history_retain_length(this);
-  }
-
   inline wuffs_base__range_ii_u64
   workbuf_len() const {
     return wuffs_png__decoder__workbuf_len(this);
@@ -11681,6 +12672,237 @@
 
 #endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__PNG) || defined(WUFFS_NONMONOLITHIC)
 
+#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__SHA256) || defined(WUFFS_NONMONOLITHIC)
+
+// ---------------- Status Codes
+
+// ---------------- Public Consts
+
+// ---------------- Struct Declarations
+
+typedef struct wuffs_sha256__hasher__struct wuffs_sha256__hasher;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// ---------------- Public Initializer Prototypes
+
+// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
+// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
+//
+// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
+// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
+
+wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
+wuffs_sha256__hasher__initialize(
+    wuffs_sha256__hasher* self,
+    size_t sizeof_star_self,
+    uint64_t wuffs_version,
+    uint32_t options);
+
+size_t
+sizeof__wuffs_sha256__hasher(void);
+
+// ---------------- Allocs
+
+// These functions allocate and initialize Wuffs structs. They return NULL if
+// memory allocation fails. If they return non-NULL, there is no need to call
+// wuffs_foo__bar__initialize, but the caller is responsible for eventually
+// calling free on the returned pointer. That pointer is effectively a C++
+// std::unique_ptr<T, wuffs_unique_ptr_deleter>.
+
+wuffs_sha256__hasher*
+wuffs_sha256__hasher__alloc(void);
+
+static inline wuffs_base__hasher_bitvec256*
+wuffs_sha256__hasher__alloc_as__wuffs_base__hasher_bitvec256(void) {
+  return (wuffs_base__hasher_bitvec256*)(wuffs_sha256__hasher__alloc());
+}
+
+// ---------------- Upcasts
+
+static inline wuffs_base__hasher_bitvec256*
+wuffs_sha256__hasher__upcast_as__wuffs_base__hasher_bitvec256(
+    wuffs_sha256__hasher* p) {
+  return (wuffs_base__hasher_bitvec256*)p;
+}
+
+// ---------------- Public Function Prototypes
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC uint64_t
+wuffs_sha256__hasher__get_quirk(
+    const wuffs_sha256__hasher* self,
+    uint32_t a_key);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__status
+wuffs_sha256__hasher__set_quirk(
+    wuffs_sha256__hasher* self,
+    uint32_t a_key,
+    uint64_t a_value);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
+wuffs_sha256__hasher__update(
+    wuffs_sha256__hasher* self,
+    wuffs_base__slice_u8 a_x);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__bitvec256
+wuffs_sha256__hasher__update_bitvec256(
+    wuffs_sha256__hasher* self,
+    wuffs_base__slice_u8 a_x);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__bitvec256
+wuffs_sha256__hasher__checksum_bitvec256(
+    const wuffs_sha256__hasher* self);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+// ---------------- Struct Definitions
+
+// These structs' fields, and the sizeof them, are private implementation
+// details that aren't guaranteed to be stable across Wuffs versions.
+//
+// See https://en.wikipedia.org/wiki/Opaque_pointer#C
+
+#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
+
+struct wuffs_sha256__hasher__struct {
+  // Do not access the private_impl's or private_data's fields directly. There
+  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
+  // the wuffs_foo__bar__baz functions.
+  //
+  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
+  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
+
+  struct {
+    uint32_t magic;
+    uint32_t active_coroutine;
+    wuffs_base__vtable vtable_for__wuffs_base__hasher_bitvec256;
+    wuffs_base__vtable null_vtable;
+
+    uint64_t f_length_modulo_u64;
+    bool f_length_overflows_u64;
+    uint8_t f_padding0;
+    uint8_t f_padding1;
+    uint8_t f_padding2;
+    uint32_t f_buf_len;
+    uint8_t f_buf_data[64];
+    uint32_t f_h0;
+    uint32_t f_h1;
+    uint32_t f_h2;
+    uint32_t f_h3;
+    uint32_t f_h4;
+    uint32_t f_h5;
+    uint32_t f_h6;
+    uint32_t f_h7;
+  } private_impl;
+
+#ifdef __cplusplus
+#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
+  using unique_ptr = std::unique_ptr<wuffs_sha256__hasher, wuffs_unique_ptr_deleter>;
+
+  // On failure, the alloc_etc functions return nullptr. They don't throw.
+
+  static inline unique_ptr
+  alloc() {
+    return unique_ptr(wuffs_sha256__hasher__alloc());
+  }
+
+  static inline wuffs_base__hasher_bitvec256::unique_ptr
+  alloc_as__wuffs_base__hasher_bitvec256() {
+    return wuffs_base__hasher_bitvec256::unique_ptr(
+        wuffs_sha256__hasher__alloc_as__wuffs_base__hasher_bitvec256());
+  }
+#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
+
+#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
+  // Disallow constructing or copying an object via standard C++ mechanisms,
+  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
+  // size and field layout is not part of the public, stable, memory-safe API.
+  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
+  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
+  // their first argument) rather than tweaking bar.private_impl.qux fields.
+  //
+  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
+  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
+  // order to provide convenience methods. These forward on "this", so that you
+  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
+  wuffs_sha256__hasher__struct() = delete;
+  wuffs_sha256__hasher__struct(const wuffs_sha256__hasher__struct&) = delete;
+  wuffs_sha256__hasher__struct& operator=(
+      const wuffs_sha256__hasher__struct&) = delete;
+#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
+
+#if !defined(WUFFS_IMPLEMENTATION)
+  // As above, the size of the struct is not part of the public API, and unless
+  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
+  // allocated, not stack allocated. Its size is not intended to be known at
+  // compile time, but it is unfortunately divulged as a side effect of
+  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
+  // instead of "sizeof T", invoking the operator. To make the two values
+  // different, so that passing the latter will be rejected by the initialize
+  // function, we add an arbitrary amount of dead weight.
+  uint8_t dead_weight[123000000];  // 123 MB.
+#endif  // !defined(WUFFS_IMPLEMENTATION)
+
+  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
+  initialize(
+      size_t sizeof_star_self,
+      uint64_t wuffs_version,
+      uint32_t options) {
+    return wuffs_sha256__hasher__initialize(
+        this, sizeof_star_self, wuffs_version, options);
+  }
+
+  inline wuffs_base__hasher_bitvec256*
+  upcast_as__wuffs_base__hasher_bitvec256() {
+    return (wuffs_base__hasher_bitvec256*)this;
+  }
+
+  inline uint64_t
+  get_quirk(
+      uint32_t a_key) const {
+    return wuffs_sha256__hasher__get_quirk(this, a_key);
+  }
+
+  inline wuffs_base__status
+  set_quirk(
+      uint32_t a_key,
+      uint64_t a_value) {
+    return wuffs_sha256__hasher__set_quirk(this, a_key, a_value);
+  }
+
+  inline wuffs_base__empty_struct
+  update(
+      wuffs_base__slice_u8 a_x) {
+    return wuffs_sha256__hasher__update(this, a_x);
+  }
+
+  inline wuffs_base__bitvec256
+  update_bitvec256(
+      wuffs_base__slice_u8 a_x) {
+    return wuffs_sha256__hasher__update_bitvec256(this, a_x);
+  }
+
+  inline wuffs_base__bitvec256
+  checksum_bitvec256() const {
+    return wuffs_sha256__hasher__checksum_bitvec256(this);
+  }
+
+#endif  // __cplusplus
+};  // struct wuffs_sha256__hasher__struct
+
+#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
+
+#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__SHA256) || defined(WUFFS_NONMONOLITHIC)
+
 #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__TGA) || defined(WUFFS_NONMONOLITHIC)
 
 // ---------------- Status Codes
@@ -11692,9 +12914,7 @@
 
 // ---------------- Public Consts
 
-#define WUFFS_TGA__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0
-
-#define WUFFS_TGA__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
+#define WUFFS_TGA__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u
 
 // ---------------- Struct Declarations
 
@@ -11828,11 +13048,6 @@
     wuffs_base__io_buffer* a_src);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_tga__decoder__history_retain_length(
-    const wuffs_tga__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
 wuffs_tga__decoder__workbuf_len(
     const wuffs_tga__decoder* self);
@@ -11882,12 +13097,12 @@
     uint64_t f_frame_config_io_position;
     wuffs_base__pixel_swizzler f_swizzler;
 
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
+    uint32_t p_decode_image_config;
+    uint32_t p_do_decode_image_config;
+    uint32_t p_decode_frame_config;
+    uint32_t p_do_decode_frame_config;
+    uint32_t p_decode_frame;
+    uint32_t p_do_decode_frame;
   } private_impl;
 
   struct {
@@ -11898,7 +13113,7 @@
     struct {
       uint32_t v_i;
       uint64_t scratch;
-    } s_do_decode_image_config[1];
+    } s_do_decode_image_config;
     struct {
       uint64_t v_dst_bytes_per_pixel;
       uint32_t v_dst_x;
@@ -11909,7 +13124,7 @@
       uint32_t v_run_length;
       uint64_t v_num_dst_bytes;
       uint64_t scratch;
-    } s_do_decode_frame[1];
+    } s_do_decode_frame;
   } private_data;
 
 #ifdef __cplusplus
@@ -12053,11 +13268,6 @@
     return wuffs_tga__decoder__tell_me_more(this, a_dst, a_minfo, a_src);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_tga__decoder__history_retain_length(this);
-  }
-
   inline wuffs_base__range_ii_u64
   workbuf_len() const {
     return wuffs_tga__decoder__workbuf_len(this);
@@ -12079,9 +13289,7 @@
 
 // ---------------- Public Consts
 
-#define WUFFS_WBMP__DECODER_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0
-
-#define WUFFS_WBMP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0
+#define WUFFS_WBMP__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 0u
 
 // ---------------- Struct Declarations
 
@@ -12215,11 +13423,6 @@
     wuffs_base__io_buffer* a_src);
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_wbmp__decoder__history_retain_length(
-    const wuffs_wbmp__decoder* self);
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
 wuffs_wbmp__decoder__workbuf_len(
     const wuffs_wbmp__decoder* self);
@@ -12257,26 +13460,26 @@
     uint64_t f_frame_config_io_position;
     wuffs_base__pixel_swizzler f_swizzler;
 
-    uint32_t p_decode_image_config[1];
-    uint32_t p_do_decode_image_config[1];
-    uint32_t p_decode_frame_config[1];
-    uint32_t p_do_decode_frame_config[1];
-    uint32_t p_decode_frame[1];
-    uint32_t p_do_decode_frame[1];
+    uint32_t p_decode_image_config;
+    uint32_t p_do_decode_image_config;
+    uint32_t p_decode_frame_config;
+    uint32_t p_do_decode_frame_config;
+    uint32_t p_decode_frame;
+    uint32_t p_do_decode_frame;
   } private_impl;
 
   struct {
     struct {
       uint32_t v_i;
       uint32_t v_p;
-    } s_do_decode_image_config[1];
+    } s_do_decode_image_config;
     struct {
       uint64_t v_dst_bytes_per_pixel;
       uint32_t v_dst_x;
       uint32_t v_dst_y;
       uint8_t v_src[1];
-      uint8_t v_c;
-    } s_do_decode_frame[1];
+      uint8_t v_c8;
+    } s_do_decode_frame;
   } private_data;
 
 #ifdef __cplusplus
@@ -12420,11 +13623,6 @@
     return wuffs_wbmp__decoder__tell_me_more(this, a_dst, a_minfo, a_src);
   }
 
-  inline uint64_t
-  history_retain_length() const {
-    return wuffs_wbmp__decoder__history_retain_length(this);
-  }
-
   inline wuffs_base__range_ii_u64
   workbuf_len() const {
     return wuffs_wbmp__decoder__workbuf_len(this);
@@ -12890,6 +14088,311 @@
 
 #endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__XXHASH64) || defined(WUFFS_NONMONOLITHIC)
 
+#if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__XZ) || defined(WUFFS_NONMONOLITHIC)
+
+// ---------------- Status Codes
+
+extern const char wuffs_xz__error__bad_block_header[];
+extern const char wuffs_xz__error__bad_checksum[];
+extern const char wuffs_xz__error__bad_filter[];
+extern const char wuffs_xz__error__bad_footer[];
+extern const char wuffs_xz__error__bad_header[];
+extern const char wuffs_xz__error__bad_header_concatenated_stream[];
+extern const char wuffs_xz__error__bad_index[];
+extern const char wuffs_xz__error__bad_padding[];
+extern const char wuffs_xz__error__truncated_input[];
+extern const char wuffs_xz__error__unsupported_checksum_algorithm[];
+extern const char wuffs_xz__error__unsupported_filter[];
+extern const char wuffs_xz__error__unsupported_filter_combination[];
+
+// ---------------- Public Consts
+
+#define WUFFS_XZ__QUIRK_DECODE_STANDALONE_CONCATENATED_STREAMS 2021322752u
+
+#define WUFFS_XZ__DECODER_DST_HISTORY_RETAIN_LENGTH_MAX_INCL_WORST_CASE 0u
+
+#define WUFFS_XZ__DECODER_WORKBUF_LEN_MAX_INCL_WORST_CASE 4294967568u
+
+// ---------------- Struct Declarations
+
+typedef struct wuffs_xz__decoder__struct wuffs_xz__decoder;
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+// ---------------- Public Initializer Prototypes
+
+// For any given "wuffs_foo__bar* self", "wuffs_foo__bar__initialize(self,
+// etc)" should be called before any other "wuffs_foo__bar__xxx(self, etc)".
+//
+// Pass sizeof(*self) and WUFFS_VERSION for sizeof_star_self and wuffs_version.
+// Pass 0 (or some combination of WUFFS_INITIALIZE__XXX) for options.
+
+wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
+wuffs_xz__decoder__initialize(
+    wuffs_xz__decoder* self,
+    size_t sizeof_star_self,
+    uint64_t wuffs_version,
+    uint32_t options);
+
+size_t
+sizeof__wuffs_xz__decoder(void);
+
+// ---------------- Allocs
+
+// These functions allocate and initialize Wuffs structs. They return NULL if
+// memory allocation fails. If they return non-NULL, there is no need to call
+// wuffs_foo__bar__initialize, but the caller is responsible for eventually
+// calling free on the returned pointer. That pointer is effectively a C++
+// std::unique_ptr<T, wuffs_unique_ptr_deleter>.
+
+wuffs_xz__decoder*
+wuffs_xz__decoder__alloc(void);
+
+static inline wuffs_base__io_transformer*
+wuffs_xz__decoder__alloc_as__wuffs_base__io_transformer(void) {
+  return (wuffs_base__io_transformer*)(wuffs_xz__decoder__alloc());
+}
+
+// ---------------- Upcasts
+
+static inline wuffs_base__io_transformer*
+wuffs_xz__decoder__upcast_as__wuffs_base__io_transformer(
+    wuffs_xz__decoder* p) {
+  return (wuffs_base__io_transformer*)p;
+}
+
+// ---------------- Public Function Prototypes
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC uint64_t
+wuffs_xz__decoder__get_quirk(
+    const wuffs_xz__decoder* self,
+    uint32_t a_key);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__status
+wuffs_xz__decoder__set_quirk(
+    wuffs_xz__decoder* self,
+    uint32_t a_key,
+    uint64_t a_value);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63
+wuffs_xz__decoder__dst_history_retain_length(
+    const wuffs_xz__decoder* self);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__range_ii_u64
+wuffs_xz__decoder__workbuf_len(
+    const wuffs_xz__decoder* self);
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__status
+wuffs_xz__decoder__transform_io(
+    wuffs_xz__decoder* self,
+    wuffs_base__io_buffer* a_dst,
+    wuffs_base__io_buffer* a_src,
+    wuffs_base__slice_u8 a_workbuf);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif
+
+// ---------------- Struct Definitions
+
+// These structs' fields, and the sizeof them, are private implementation
+// details that aren't guaranteed to be stable across Wuffs versions.
+//
+// See https://en.wikipedia.org/wiki/Opaque_pointer#C
+
+#if defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
+
+struct wuffs_xz__decoder__struct {
+  // Do not access the private_impl's or private_data's fields directly. There
+  // is no API/ABI compatibility or safety guarantee if you do so. Instead, use
+  // the wuffs_foo__bar__baz functions.
+  //
+  // It is a struct, not a struct*, so that the outermost wuffs_foo__bar struct
+  // can be stack allocated when WUFFS_IMPLEMENTATION is defined.
+
+  struct {
+    uint32_t magic;
+    uint32_t active_coroutine;
+    wuffs_base__vtable vtable_for__wuffs_base__io_transformer;
+    wuffs_base__vtable null_vtable;
+
+    uint32_t f_filters[3];
+    uint32_t f_num_non_final_filters;
+    uint8_t f_checksummer;
+    bool f_ignore_checksum;
+    bool f_standalone_format;
+    bool f_lzma_needs_reset;
+    bool f_block_has_compressed_size;
+    bool f_block_has_uncompressed_size;
+    uint8_t f_bcj_undo_index;
+    uint32_t f_bcj_pos;
+    uint32_t f_bcj_x86_prev_mask;
+    uint64_t f_block_compressed_size;
+    uint64_t f_block_uncompressed_size;
+    uint64_t f_compressed_size_for_index;
+    uint32_t f_verification_have_hashed_sizes[2];
+    uint32_t f_verification_want_hashed_sizes[2];
+    uint64_t f_verification_have_total_sizes[2];
+    uint64_t f_verification_want_total_sizes[2];
+    uint64_t f_num_actual_blocks;
+    uint64_t f_num_index_blocks;
+    uint64_t f_index_block_compressed_size;
+    uint64_t f_index_block_uncompressed_size;
+    uint64_t f_backwards_size;
+    bool f_started_verify_index;
+    uint16_t f_flags;
+
+    uint8_t (*choosy_apply_non_final_filters)(
+        wuffs_xz__decoder* self,
+        wuffs_base__slice_u8 a_dst_slice);
+    uint32_t p_transform_io;
+    uint32_t p_do_transform_io;
+    uint32_t p_decode_block_header_with_padding;
+    uint32_t p_decode_block_header_sans_padding;
+    uint32_t p_verify_index;
+    uint32_t p_verify_footer;
+  } private_impl;
+
+  struct {
+    uint8_t f_filter_data[3][256];
+    wuffs_crc32__ieee_hasher f_crc32;
+    wuffs_crc64__ecma_hasher f_crc64;
+    wuffs_sha256__hasher f_sha256;
+    wuffs_lzma__decoder f_lzma;
+
+    struct {
+      uint32_t v_checksum32_have;
+      uint32_t v_checksum32_want;
+      wuffs_base__bitvec256 v_checksum256_have;
+      uint64_t v_compressed_size;
+      uint64_t v_uncompressed_size;
+      uint64_t scratch;
+    } s_do_transform_io;
+    struct {
+      uint64_t v_padded_size_have;
+      uint64_t v_padded_size_want;
+    } s_decode_block_header_with_padding;
+    struct {
+      uint8_t v_flags;
+      uint32_t v_shift;
+      uint32_t v_f;
+      uint64_t scratch;
+    } s_decode_block_header_sans_padding;
+    struct {
+      uint32_t v_shift;
+    } s_verify_index;
+    struct {
+      uint64_t scratch;
+    } s_verify_footer;
+  } private_data;
+
+#ifdef __cplusplus
+#if defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
+  using unique_ptr = std::unique_ptr<wuffs_xz__decoder, wuffs_unique_ptr_deleter>;
+
+  // On failure, the alloc_etc functions return nullptr. They don't throw.
+
+  static inline unique_ptr
+  alloc() {
+    return unique_ptr(wuffs_xz__decoder__alloc());
+  }
+
+  static inline wuffs_base__io_transformer::unique_ptr
+  alloc_as__wuffs_base__io_transformer() {
+    return wuffs_base__io_transformer::unique_ptr(
+        wuffs_xz__decoder__alloc_as__wuffs_base__io_transformer());
+  }
+#endif  // defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
+
+#if defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
+  // Disallow constructing or copying an object via standard C++ mechanisms,
+  // e.g. the "new" operator, as this struct is intentionally opaque. Its total
+  // size and field layout is not part of the public, stable, memory-safe API.
+  // Use malloc or memcpy and the sizeof__wuffs_foo__bar function instead, and
+  // call wuffs_foo__bar__baz methods (which all take a "this"-like pointer as
+  // their first argument) rather than tweaking bar.private_impl.qux fields.
+  //
+  // In C, we can just leave wuffs_foo__bar as an incomplete type (unless
+  // WUFFS_IMPLEMENTATION is #define'd). In C++, we define a complete type in
+  // order to provide convenience methods. These forward on "this", so that you
+  // can write "bar->baz(etc)" instead of "wuffs_foo__bar__baz(bar, etc)".
+  wuffs_xz__decoder__struct() = delete;
+  wuffs_xz__decoder__struct(const wuffs_xz__decoder__struct&) = delete;
+  wuffs_xz__decoder__struct& operator=(
+      const wuffs_xz__decoder__struct&) = delete;
+#endif  // defined(WUFFS_BASE__HAVE_EQ_DELETE) && !defined(WUFFS_IMPLEMENTATION)
+
+#if !defined(WUFFS_IMPLEMENTATION)
+  // As above, the size of the struct is not part of the public API, and unless
+  // WUFFS_IMPLEMENTATION is #define'd, this struct type T should be heap
+  // allocated, not stack allocated. Its size is not intended to be known at
+  // compile time, but it is unfortunately divulged as a side effect of
+  // defining C++ convenience methods. Use "sizeof__T()", calling the function,
+  // instead of "sizeof T", invoking the operator. To make the two values
+  // different, so that passing the latter will be rejected by the initialize
+  // function, we add an arbitrary amount of dead weight.
+  uint8_t dead_weight[123000000];  // 123 MB.
+#endif  // !defined(WUFFS_IMPLEMENTATION)
+
+  inline wuffs_base__status WUFFS_BASE__WARN_UNUSED_RESULT
+  initialize(
+      size_t sizeof_star_self,
+      uint64_t wuffs_version,
+      uint32_t options) {
+    return wuffs_xz__decoder__initialize(
+        this, sizeof_star_self, wuffs_version, options);
+  }
+
+  inline wuffs_base__io_transformer*
+  upcast_as__wuffs_base__io_transformer() {
+    return (wuffs_base__io_transformer*)this;
+  }
+
+  inline uint64_t
+  get_quirk(
+      uint32_t a_key) const {
+    return wuffs_xz__decoder__get_quirk(this, a_key);
+  }
+
+  inline wuffs_base__status
+  set_quirk(
+      uint32_t a_key,
+      uint64_t a_value) {
+    return wuffs_xz__decoder__set_quirk(this, a_key, a_value);
+  }
+
+  inline wuffs_base__optional_u63
+  dst_history_retain_length() const {
+    return wuffs_xz__decoder__dst_history_retain_length(this);
+  }
+
+  inline wuffs_base__range_ii_u64
+  workbuf_len() const {
+    return wuffs_xz__decoder__workbuf_len(this);
+  }
+
+  inline wuffs_base__status
+  transform_io(
+      wuffs_base__io_buffer* a_dst,
+      wuffs_base__io_buffer* a_src,
+      wuffs_base__slice_u8 a_workbuf) {
+    return wuffs_xz__decoder__transform_io(this, a_dst, a_src, a_workbuf);
+  }
+
+#endif  // __cplusplus
+};  // struct wuffs_xz__decoder__struct
+
+#endif  // defined(__cplusplus) || defined(WUFFS_IMPLEMENTATION)
+
+#endif  // !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__XZ) || defined(WUFFS_NONMONOLITHIC)
+
 #if defined(__cplusplus) && defined(WUFFS_BASE__HAVE_UNIQUE_PTR)
 
 // ---------------- Auxiliary - Base
@@ -12968,6 +14471,8 @@
   DynIOBuffer(const DynIOBuffer&) = delete;
   DynIOBuffer& operator=(const DynIOBuffer&) = delete;
 
+  bool allocated();
+
   static uint64_t round_up(uint64_t min_incl, uint64_t max_incl);
 };
 
@@ -12978,7 +14483,7 @@
   virtual ~Input();
 
   virtual IOBuffer* BringsItsOwnIOBuffer();
-  virtual std::string CopyIn(IOBuffer* dst, uint64_t history_retain_length) = 0;
+  virtual std::string CopyIn(IOBuffer* dst) = 0;
 };
 
 // --------
@@ -12990,7 +14495,7 @@
  public:
   FileInput(FILE* f);
 
-  virtual std::string CopyIn(IOBuffer* dst, uint64_t history_retain_length);
+  virtual std::string CopyIn(IOBuffer* dst);
 
  private:
   FILE* m_f;
@@ -13011,7 +14516,7 @@
   MemoryInput(const uint8_t* ptr, size_t len);
 
   virtual IOBuffer* BringsItsOwnIOBuffer();
-  virtual std::string CopyIn(IOBuffer* dst, uint64_t history_retain_length);
+  virtual std::string CopyIn(IOBuffer* dst);
 
  private:
   IOBuffer m_io;
@@ -13625,27 +15130,13 @@
 
 // --------
 
-#if defined(__GNUC__)
-#pragma GCC diagnostic push
-#pragma GCC diagnostic ignored "-Wcast-qual"
-#endif
-static inline uint8_t*  //
-wuffs_base__strip_const_from_u8_ptr(const uint8_t* ptr) {
-  return (uint8_t*)ptr;
-}
-#if defined(__GNUC__)
-#pragma GCC diagnostic pop
-#endif
-
-// --------
-
 static inline wuffs_base__empty_struct  //
-wuffs_base__ignore_status(wuffs_base__status z) {
+wuffs_private_impl__ignore_status(wuffs_base__status z) {
   return wuffs_base__make_empty_struct();
 }
 
 static inline wuffs_base__status  //
-wuffs_base__status__ensure_not_a_suspension(wuffs_base__status z) {
+wuffs_private_impl__status__ensure_not_a_suspension(wuffs_base__status z) {
   if (z.repr && (*z.repr == '$')) {
     z.repr = wuffs_base__error__cannot_return_a_suspension;
   }
@@ -13654,9 +15145,10 @@
 
 // --------
 
-// wuffs_base__iterate_total_advance returns the exclusive pointer-offset at
-// which iteration should stop. The overall slice has length total_len, each
-// iteration's sub-slice has length iter_len and are placed iter_advance apart.
+// wuffs_private_impl__iterate_total_advance returns the exclusive
+// pointer-offset at which iteration should stop. The overall slice has length
+// total_len, each iteration's sub-slice has length iter_len and are placed
+// iter_advance apart.
 //
 // The iter_advance may not be larger than iter_len. The iter_advance may be
 // smaller than iter_len, in which case the sub-slices will overlap.
@@ -13684,9 +15176,9 @@
 //                $
 // 0123456789012345
 static inline size_t  //
-wuffs_base__iterate_total_advance(size_t total_len,
-                                  size_t iter_len,
-                                  size_t iter_advance) {
+wuffs_private_impl__iterate_total_advance(size_t total_len,
+                                          size_t iter_len,
+                                          size_t iter_advance) {
   if (total_len >= iter_len) {
     size_t n = total_len - iter_len;
     return ((n / iter_advance) * iter_advance) + iter_advance;
@@ -13696,55 +15188,59 @@
 
 // ---------------- Numeric Types
 
-extern const uint8_t wuffs_base__low_bits_mask__u8[8];
-extern const uint16_t wuffs_base__low_bits_mask__u16[16];
-extern const uint32_t wuffs_base__low_bits_mask__u32[32];
-extern const uint64_t wuffs_base__low_bits_mask__u64[64];
+extern const uint8_t wuffs_private_impl__low_bits_mask__u8[8];
+extern const uint16_t wuffs_private_impl__low_bits_mask__u16[16];
+extern const uint32_t wuffs_private_impl__low_bits_mask__u32[32];
+extern const uint64_t wuffs_private_impl__low_bits_mask__u64[64];
 
-#define WUFFS_BASE__LOW_BITS_MASK__U8(n) (wuffs_base__low_bits_mask__u8[n])
-#define WUFFS_BASE__LOW_BITS_MASK__U16(n) (wuffs_base__low_bits_mask__u16[n])
-#define WUFFS_BASE__LOW_BITS_MASK__U32(n) (wuffs_base__low_bits_mask__u32[n])
-#define WUFFS_BASE__LOW_BITS_MASK__U64(n) (wuffs_base__low_bits_mask__u64[n])
+#define WUFFS_PRIVATE_IMPL__LOW_BITS_MASK__U8(n) \
+  (wuffs_private_impl__low_bits_mask__u8[n])
+#define WUFFS_PRIVATE_IMPL__LOW_BITS_MASK__U16(n) \
+  (wuffs_private_impl__low_bits_mask__u16[n])
+#define WUFFS_PRIVATE_IMPL__LOW_BITS_MASK__U32(n) \
+  (wuffs_private_impl__low_bits_mask__u32[n])
+#define WUFFS_PRIVATE_IMPL__LOW_BITS_MASK__U64(n) \
+  (wuffs_private_impl__low_bits_mask__u64[n])
 
 // --------
 
 static inline void  //
-wuffs_base__u8__sat_add_indirect(uint8_t* x, uint8_t y) {
+wuffs_private_impl__u8__sat_add_indirect(uint8_t* x, uint8_t y) {
   *x = wuffs_base__u8__sat_add(*x, y);
 }
 
 static inline void  //
-wuffs_base__u8__sat_sub_indirect(uint8_t* x, uint8_t y) {
+wuffs_private_impl__u8__sat_sub_indirect(uint8_t* x, uint8_t y) {
   *x = wuffs_base__u8__sat_sub(*x, y);
 }
 
 static inline void  //
-wuffs_base__u16__sat_add_indirect(uint16_t* x, uint16_t y) {
+wuffs_private_impl__u16__sat_add_indirect(uint16_t* x, uint16_t y) {
   *x = wuffs_base__u16__sat_add(*x, y);
 }
 
 static inline void  //
-wuffs_base__u16__sat_sub_indirect(uint16_t* x, uint16_t y) {
+wuffs_private_impl__u16__sat_sub_indirect(uint16_t* x, uint16_t y) {
   *x = wuffs_base__u16__sat_sub(*x, y);
 }
 
 static inline void  //
-wuffs_base__u32__sat_add_indirect(uint32_t* x, uint32_t y) {
+wuffs_private_impl__u32__sat_add_indirect(uint32_t* x, uint32_t y) {
   *x = wuffs_base__u32__sat_add(*x, y);
 }
 
 static inline void  //
-wuffs_base__u32__sat_sub_indirect(uint32_t* x, uint32_t y) {
+wuffs_private_impl__u32__sat_sub_indirect(uint32_t* x, uint32_t y) {
   *x = wuffs_base__u32__sat_sub(*x, y);
 }
 
 static inline void  //
-wuffs_base__u64__sat_add_indirect(uint64_t* x, uint64_t y) {
+wuffs_private_impl__u64__sat_add_indirect(uint64_t* x, uint64_t y) {
   *x = wuffs_base__u64__sat_add(*x, y);
 }
 
 static inline void  //
-wuffs_base__u64__sat_sub_indirect(uint64_t* x, uint64_t y) {
+wuffs_private_impl__u64__sat_sub_indirect(uint64_t* x, uint64_t y) {
   *x = wuffs_base__u64__sat_sub(*x, y);
 }
 
@@ -13759,20 +15255,28 @@
 #define wuffs_base__utility__sign_extend_rshift_u64(a, n) \
   ((uint64_t)(((int64_t)(a)) >> (n)))
 
+#define wuffs_base__utility__make_bitvec256(e00, e01, e02, e03) \
+  wuffs_base__make_bitvec256(e00, e01, e02, e03)
+
+#define wuffs_base__utility__make_optional_u63(h, v) \
+  wuffs_base__make_optional_u63(h, v)
+
 // ---------------- Slices and Tables
 
-// wuffs_base__slice_u8__prefix returns up to the first up_to bytes of s.
+// wuffs_private_impl__slice_u8__prefix returns up to the first up_to bytes of
+// s.
 static inline wuffs_base__slice_u8  //
-wuffs_base__slice_u8__prefix(wuffs_base__slice_u8 s, uint64_t up_to) {
+wuffs_private_impl__slice_u8__prefix(wuffs_base__slice_u8 s, uint64_t up_to) {
   if (((uint64_t)(s.len)) > up_to) {
     s.len = ((size_t)up_to);
   }
   return s;
 }
 
-// wuffs_base__slice_u8__suffix returns up to the last up_to bytes of s.
+// wuffs_private_impl__slice_u8__suffix returns up to the last up_to bytes of
+// s.
 static inline wuffs_base__slice_u8  //
-wuffs_base__slice_u8__suffix(wuffs_base__slice_u8 s, uint64_t up_to) {
+wuffs_private_impl__slice_u8__suffix(wuffs_base__slice_u8 s, uint64_t up_to) {
   if (((uint64_t)(s.len)) > up_to) {
     s.ptr += ((uint64_t)(s.len)) - up_to;
     s.len = ((size_t)up_to);
@@ -13780,14 +15284,14 @@
   return s;
 }
 
-// wuffs_base__slice_u8__copy_from_slice calls memmove(dst.ptr, src.ptr, len)
-// where len is the minimum of dst.len and src.len.
+// wuffs_private_impl__slice_u8__copy_from_slice calls memmove(dst.ptr,
+// src.ptr, len) where len is the minimum of dst.len and src.len.
 //
 // Passing a wuffs_base__slice_u8 with all fields NULL or zero (a valid, empty
 // slice) is valid and results in a no-op.
 static inline uint64_t  //
-wuffs_base__slice_u8__copy_from_slice(wuffs_base__slice_u8 dst,
-                                      wuffs_base__slice_u8 src) {
+wuffs_private_impl__slice_u8__copy_from_slice(wuffs_base__slice_u8 dst,
+                                              wuffs_base__slice_u8 src) {
   size_t len = dst.len < src.len ? dst.len : src.len;
   if (len > 0) {
     memmove(dst.ptr, src.ptr, len);
@@ -13796,9 +15300,9 @@
 }
 
 static inline wuffs_base__empty_struct  //
-wuffs_base__bulk_load_host_endian(void* ptr,
-                                  size_t len,
-                                  wuffs_base__slice_u8 src) {
+wuffs_private_impl__bulk_load_host_endian(void* ptr,
+                                          size_t len,
+                                          wuffs_base__slice_u8 src) {
   if (len && (len <= src.len)) {
     memmove(ptr, src.ptr, len);
   }
@@ -13806,7 +15310,7 @@
 }
 
 static inline wuffs_base__empty_struct  //
-wuffs_base__bulk_memset(void* ptr, size_t len, uint8_t byte_value) {
+wuffs_private_impl__bulk_memset(void* ptr, size_t len, uint8_t byte_value) {
   if (len) {
     memset(ptr, byte_value, len);
   }
@@ -13814,9 +15318,9 @@
 }
 
 static inline wuffs_base__empty_struct  //
-wuffs_base__bulk_save_host_endian(void* ptr,
-                                  size_t len,
-                                  wuffs_base__slice_u8 dst) {
+wuffs_private_impl__bulk_save_host_endian(void* ptr,
+                                          size_t len,
+                                          wuffs_base__slice_u8 dst) {
   if (len && (len <= dst.len)) {
     memmove(dst.ptr, ptr, len);
   }
@@ -13826,11 +15330,11 @@
 // --------
 
 static inline wuffs_base__slice_u8  //
-wuffs_base__table_u8__row_u32(wuffs_base__table_u8 t, uint32_t y) {
+wuffs_private_impl__table_u8__row_u32(wuffs_base__table_u8 t, uint32_t y) {
   if (y < t.height) {
     return wuffs_base__make_slice_u8(t.ptr + (t.stride * y), t.width);
   }
-  return wuffs_base__make_slice_u8(NULL, 0);
+  return wuffs_base__empty_slice_u8();
 }
 
 // ---------------- Slices and Tables (Utility)
@@ -13840,42 +15344,50 @@
 // ---------------- Ranges and Rects
 
 static inline uint32_t  //
-wuffs_base__range_ii_u32__get_min_incl(const wuffs_base__range_ii_u32* r) {
+wuffs_private_impl__range_ii_u32__get_min_incl(
+    const wuffs_base__range_ii_u32* r) {
   return r->min_incl;
 }
 
 static inline uint32_t  //
-wuffs_base__range_ii_u32__get_max_incl(const wuffs_base__range_ii_u32* r) {
+wuffs_private_impl__range_ii_u32__get_max_incl(
+    const wuffs_base__range_ii_u32* r) {
   return r->max_incl;
 }
 
 static inline uint32_t  //
-wuffs_base__range_ie_u32__get_min_incl(const wuffs_base__range_ie_u32* r) {
+wuffs_private_impl__range_ie_u32__get_min_incl(
+    const wuffs_base__range_ie_u32* r) {
   return r->min_incl;
 }
 
 static inline uint32_t  //
-wuffs_base__range_ie_u32__get_max_excl(const wuffs_base__range_ie_u32* r) {
+wuffs_private_impl__range_ie_u32__get_max_excl(
+    const wuffs_base__range_ie_u32* r) {
   return r->max_excl;
 }
 
 static inline uint64_t  //
-wuffs_base__range_ii_u64__get_min_incl(const wuffs_base__range_ii_u64* r) {
+wuffs_private_impl__range_ii_u64__get_min_incl(
+    const wuffs_base__range_ii_u64* r) {
   return r->min_incl;
 }
 
 static inline uint64_t  //
-wuffs_base__range_ii_u64__get_max_incl(const wuffs_base__range_ii_u64* r) {
+wuffs_private_impl__range_ii_u64__get_max_incl(
+    const wuffs_base__range_ii_u64* r) {
   return r->max_incl;
 }
 
 static inline uint64_t  //
-wuffs_base__range_ie_u64__get_min_incl(const wuffs_base__range_ie_u64* r) {
+wuffs_private_impl__range_ie_u64__get_min_incl(
+    const wuffs_base__range_ie_u64* r) {
   return r->min_incl;
 }
 
 static inline uint64_t  //
-wuffs_base__range_ie_u64__get_max_excl(const wuffs_base__range_ie_u64* r) {
+wuffs_private_impl__range_ie_u64__get_max_excl(
+    const wuffs_base__range_ie_u64* r) {
   return r->max_excl;
 }
 
@@ -13897,7 +15409,7 @@
 // ---------------- I/O
 
 static inline uint64_t  //
-wuffs_base__io__count_since(uint64_t mark, uint64_t index) {
+wuffs_private_impl__io__count_since(uint64_t mark, uint64_t index) {
   if (index >= mark) {
     return index - mark;
   }
@@ -13911,12 +15423,14 @@
 #pragma GCC diagnostic ignored "-Wcast-qual"
 #endif
 static inline wuffs_base__slice_u8  //
-wuffs_base__io__since(uint64_t mark, uint64_t index, const uint8_t* ptr) {
+wuffs_private_impl__io__since(uint64_t mark,
+                              uint64_t index,
+                              const uint8_t* ptr) {
   if (index >= mark) {
     return wuffs_base__make_slice_u8(((uint8_t*)ptr) + mark,
                                      ((size_t)(index - mark)));
   }
-  return wuffs_base__make_slice_u8(NULL, 0);
+  return wuffs_base__empty_slice_u8();
 }
 #if defined(__GNUC__)
 #pragma GCC diagnostic pop
@@ -13925,19 +15439,20 @@
 // --------
 
 static inline void  //
-wuffs_base__io_reader__limit(const uint8_t** ptr_io2_r,
-                             const uint8_t* iop_r,
-                             uint64_t limit) {
+wuffs_private_impl__io_reader__limit(const uint8_t** ptr_io2_r,
+                                     const uint8_t* iop_r,
+                                     uint64_t limit) {
   if (((uint64_t)(*ptr_io2_r - iop_r)) > limit) {
     *ptr_io2_r = iop_r + limit;
   }
 }
 
 static inline uint32_t  //
-wuffs_base__io_reader__limited_copy_u32_to_slice(const uint8_t** ptr_iop_r,
-                                                 const uint8_t* io2_r,
-                                                 uint32_t length,
-                                                 wuffs_base__slice_u8 dst) {
+wuffs_private_impl__io_reader__limited_copy_u32_to_slice(
+    const uint8_t** ptr_iop_r,
+    const uint8_t* io2_r,
+    uint32_t length,
+    wuffs_base__slice_u8 dst) {
   const uint8_t* iop_r = *ptr_iop_r;
   size_t n = dst.len;
   if (n > length) {
@@ -13953,9 +15468,9 @@
   return (uint32_t)(n);
 }
 
-// wuffs_base__io_reader__match7 returns whether the io_reader's upcoming bytes
-// start with the given prefix (up to 7 bytes long). It is peek-like, not
-// read-like, in that there are no side-effects.
+// wuffs_private_impl__io_reader__match7 returns whether the io_reader's
+// upcoming bytes start with the given prefix (up to 7 bytes long). It is
+// peek-like, not read-like, in that there are no side-effects.
 //
 // The low 3 bits of a hold the prefix length, n.
 //
@@ -13968,10 +15483,10 @@
 //  - 1 means inconclusive, equivalent to "$short read".
 //  - 2 means failure.
 static inline uint32_t  //
-wuffs_base__io_reader__match7(const uint8_t* iop_r,
-                              const uint8_t* io2_r,
-                              wuffs_base__io_buffer* r,
-                              uint64_t a) {
+wuffs_private_impl__io_reader__match7(const uint8_t* iop_r,
+                                      const uint8_t* io2_r,
+                                      wuffs_base__io_buffer* r,
+                                      uint64_t a) {
   uint32_t n = a & 7;
   a >>= 8;
   if ((io2_r - iop_r) >= 8) {
@@ -13992,13 +15507,13 @@
 }
 
 static inline wuffs_base__io_buffer*  //
-wuffs_base__io_reader__set(wuffs_base__io_buffer* b,
-                           const uint8_t** ptr_iop_r,
-                           const uint8_t** ptr_io0_r,
-                           const uint8_t** ptr_io1_r,
-                           const uint8_t** ptr_io2_r,
-                           wuffs_base__slice_u8 data,
-                           uint64_t history_position) {
+wuffs_private_impl__io_reader__set(wuffs_base__io_buffer* b,
+                                   const uint8_t** ptr_iop_r,
+                                   const uint8_t** ptr_io0_r,
+                                   const uint8_t** ptr_io1_r,
+                                   const uint8_t** ptr_io2_r,
+                                   wuffs_base__slice_u8 data,
+                                   uint64_t history_position) {
   b->data = data;
   b->meta.wi = data.len;
   b->meta.ri = 0;
@@ -14016,9 +15531,9 @@
 // --------
 
 static inline uint64_t  //
-wuffs_base__io_writer__copy_from_slice(uint8_t** ptr_iop_w,
-                                       uint8_t* io2_w,
-                                       wuffs_base__slice_u8 src) {
+wuffs_private_impl__io_writer__copy_from_slice(uint8_t** ptr_iop_w,
+                                               uint8_t* io2_w,
+                                               wuffs_base__slice_u8 src) {
   uint8_t* iop_w = *ptr_iop_w;
   size_t n = src.len;
   if (n > ((size_t)(io2_w - iop_w))) {
@@ -14032,20 +15547,21 @@
 }
 
 static inline void  //
-wuffs_base__io_writer__limit(uint8_t** ptr_io2_w,
-                             uint8_t* iop_w,
-                             uint64_t limit) {
+wuffs_private_impl__io_writer__limit(uint8_t** ptr_io2_w,
+                                     uint8_t* iop_w,
+                                     uint64_t limit) {
   if (((uint64_t)(*ptr_io2_w - iop_w)) > limit) {
     *ptr_io2_w = iop_w + limit;
   }
 }
 
 static inline uint32_t  //
-wuffs_base__io_writer__limited_copy_u32_from_history(uint8_t** ptr_iop_w,
-                                                     uint8_t* io0_w,
-                                                     uint8_t* io2_w,
-                                                     uint32_t length,
-                                                     uint32_t distance) {
+wuffs_private_impl__io_writer__limited_copy_u32_from_history(
+    uint8_t** ptr_iop_w,
+    uint8_t* io0_w,
+    uint8_t* io2_w,
+    uint32_t length,
+    uint32_t distance) {
   if (!distance) {
     return 0;
   }
@@ -14067,7 +15583,8 @@
   // argument, and the cgen can look if that argument is the constant
   // expression '3'.
   //
-  // See also wuffs_base__io_writer__limited_copy_u32_from_history_fast below.
+  // See also wuffs_private_impl__io_writer__limited_copy_u32_from_history_fast
+  // below.
   for (; n >= 3; n -= 3) {
     *p++ = *q++;
     *p++ = *q++;
@@ -14080,20 +15597,22 @@
   return length;
 }
 
-// wuffs_base__io_writer__limited_copy_u32_from_history_fast is like the
-// wuffs_base__io_writer__limited_copy_u32_from_history function above, but has
-// stronger pre-conditions.
+// wuffs_private_impl__io_writer__limited_copy_u32_from_history_fast is like
+// the wuffs_private_impl__io_writer__limited_copy_u32_from_history function
+// above, but has stronger pre-conditions.
 //
 // The caller needs to prove that:
+//  - length   >= 1
 //  - length   <= (io2_w      - *ptr_iop_w)
 //  - distance >= 1
 //  - distance <= (*ptr_iop_w - io0_w)
 static inline uint32_t  //
-wuffs_base__io_writer__limited_copy_u32_from_history_fast(uint8_t** ptr_iop_w,
-                                                          uint8_t* io0_w,
-                                                          uint8_t* io2_w,
-                                                          uint32_t length,
-                                                          uint32_t distance) {
+wuffs_private_impl__io_writer__limited_copy_u32_from_history_fast(
+    uint8_t** ptr_iop_w,
+    uint8_t* io0_w,
+    uint8_t* io2_w,
+    uint32_t length,
+    uint32_t distance) {
   uint8_t* p = *ptr_iop_w;
   uint8_t* q = p - distance;
   uint32_t n = length;
@@ -14109,7 +15628,44 @@
   return length;
 }
 
-// wuffs_base__io_writer__limited_copy_u32_from_history_8_byte_chunks_distance_1_fast
+// wuffs_private_impl__io_writer__limited_copy_u32_from_history_fast_return_cusp
+// is like the
+// wuffs_private_impl__io_writer__limited_copy_u32_from_history_fast function,
+// but also returns the cusp: a byte pair (as a u16le) being the last byte of
+// and next byte after the copied history.
+//
+// For example, if history was [10, 11, 12, 13, 14, 15, 16, 17, 18] then:
+//  - copying l=3, d=8 produces [11, 12, 13] and the cusp is (13, 14).
+//  - copying l=3, d=2 produces [17, 18, 17] and the cusp is (17, 18).
+//
+// The caller needs to prove that:
+//  - length   >= 1
+//  - length   <= (io2_w      - *ptr_iop_w)
+//  - distance >= 1
+//  - distance <= (*ptr_iop_w - io0_w)
+static inline uint32_t  //
+wuffs_private_impl__io_writer__limited_copy_u32_from_history_fast_return_cusp(
+    uint8_t** ptr_iop_w,
+    uint8_t* io0_w,
+    uint8_t* io2_w,
+    uint32_t length,
+    uint32_t distance) {
+  uint8_t* p = *ptr_iop_w;
+  uint8_t* q = p - distance;
+  uint32_t n = length;
+  for (; n >= 3; n -= 3) {
+    *p++ = *q++;
+    *p++ = *q++;
+    *p++ = *q++;
+  }
+  for (; n; n--) {
+    *p++ = *q++;
+  }
+  *ptr_iop_w = p;
+  return (uint32_t)wuffs_base__peek_u16le__no_bounds_check(q - 1);
+}
+
+// wuffs_private_impl__io_writer__limited_copy_u32_from_history_8_byte_chunks_distance_1_fast
 // copies the previous byte (the one immediately before *ptr_iop_w), copying 8
 // byte chunks at a time. Each chunk contains 8 repetitions of the same byte.
 //
@@ -14120,11 +15676,12 @@
 // In terms of advancing *ptr_iop_w, length is not rounded up.
 //
 // The caller needs to prove that:
+//  - length       >= 1
 //  - (length + 8) <= (io2_w      - *ptr_iop_w)
 //  - distance     == 1
 //  - distance     <= (*ptr_iop_w - io0_w)
 static inline uint32_t  //
-wuffs_base__io_writer__limited_copy_u32_from_history_8_byte_chunks_distance_1_fast(
+wuffs_private_impl__io_writer__limited_copy_u32_from_history_8_byte_chunks_distance_1_fast(
     uint8_t** ptr_iop_w,
     uint8_t* io0_w,
     uint8_t* io2_w,
@@ -14149,8 +15706,55 @@
   return length;
 }
 
-// wuffs_base__io_writer__limited_copy_u32_from_history_8_byte_chunks_fast is
-// like the wuffs_base__io_writer__limited_copy_u32_from_history_fast function
+// wuffs_private_impl__io_writer__limited_copy_u32_from_history_8_byte_chunks_distance_1_fast_return_cusp
+// copies the previous byte (the one immediately before *ptr_iop_w), copying 8
+// byte chunks at a time. Each chunk contains 8 repetitions of the same byte.
+// It also returns the cusp: a byte pair (as a u16le) being the last byte of
+// and next byte after the copied history.
+//
+// In terms of number of bytes copied, length is rounded up to a multiple of 8.
+// As a special case, a zero length rounds up to 8 (even though 0 is already a
+// multiple of 8), since there is always at least one 8 byte chunk copied.
+//
+// In terms of advancing *ptr_iop_w, length is not rounded up.
+//
+// The caller needs to prove that:
+//  - length       >= 1
+//  - (length + 8) <= (io2_w      - *ptr_iop_w)
+//  - distance     == 1
+//  - distance     <= (*ptr_iop_w - io0_w)
+static inline uint32_t  //
+wuffs_private_impl__io_writer__limited_copy_u32_from_history_8_byte_chunks_distance_1_fast_return_cusp(
+    uint8_t** ptr_iop_w,
+    uint8_t* io0_w,
+    uint8_t* io2_w,
+    uint32_t length,
+    uint32_t distance) {
+  uint8_t* p = *ptr_iop_w;
+  uint8_t* q = p - distance;
+  uint64_t x = p[-1];
+  x |= x << 8;
+  x |= x << 16;
+  x |= x << 32;
+  uint32_t n = length;
+  while (1) {
+    wuffs_base__poke_u64le__no_bounds_check(p, x);
+    if (n <= 8) {
+      p += n;
+      q += n;
+      break;
+    }
+    p += 8;
+    q += 8;
+    n -= 8;
+  }
+  *ptr_iop_w = p;
+  return (uint32_t)wuffs_base__peek_u16le__no_bounds_check(q - 1);
+}
+
+// wuffs_private_impl__io_writer__limited_copy_u32_from_history_8_byte_chunks_fast
+// is like the
+// wuffs_private_impl__io_writer__limited_copy_u32_from_history_fast function
 // above, but copies 8 byte chunks at a time.
 //
 // In terms of number of bytes copied, length is rounded up to a multiple of 8.
@@ -14160,11 +15764,12 @@
 // In terms of advancing *ptr_iop_w, length is not rounded up.
 //
 // The caller needs to prove that:
+//  - length       >= 1
 //  - (length + 8) <= (io2_w      - *ptr_iop_w)
 //  - distance     >= 8
 //  - distance     <= (*ptr_iop_w - io0_w)
 static inline uint32_t  //
-wuffs_base__io_writer__limited_copy_u32_from_history_8_byte_chunks_fast(
+wuffs_private_impl__io_writer__limited_copy_u32_from_history_8_byte_chunks_fast(
     uint8_t** ptr_iop_w,
     uint8_t* io0_w,
     uint8_t* io2_w,
@@ -14187,12 +15792,56 @@
   return length;
 }
 
+// wuffs_private_impl__io_writer__limited_copy_u32_from_history_8_byte_chunks_fast_return_cusp
+// is like the
+// wuffs_private_impl__io_writer__limited_copy_u32_from_history_fast function
+// above, but copies 8 byte chunks at a time. It also returns the cusp: a byte
+// pair (as a u16le) being the last byte of and next byte after the copied
+// history.
+//
+// In terms of number of bytes copied, length is rounded up to a multiple of 8.
+// As a special case, a zero length rounds up to 8 (even though 0 is already a
+// multiple of 8), since there is always at least one 8 byte chunk copied.
+//
+// In terms of advancing *ptr_iop_w, length is not rounded up.
+//
+// The caller needs to prove that:
+//  - length       >= 1
+//  - (length + 8) <= (io2_w      - *ptr_iop_w)
+//  - distance     >= 8
+//  - distance     <= (*ptr_iop_w - io0_w)
 static inline uint32_t  //
-wuffs_base__io_writer__limited_copy_u32_from_reader(uint8_t** ptr_iop_w,
-                                                    uint8_t* io2_w,
-                                                    uint32_t length,
-                                                    const uint8_t** ptr_iop_r,
-                                                    const uint8_t* io2_r) {
+wuffs_private_impl__io_writer__limited_copy_u32_from_history_8_byte_chunks_fast_return_cusp(
+    uint8_t** ptr_iop_w,
+    uint8_t* io0_w,
+    uint8_t* io2_w,
+    uint32_t length,
+    uint32_t distance) {
+  uint8_t* p = *ptr_iop_w;
+  uint8_t* q = p - distance;
+  uint32_t n = length;
+  while (1) {
+    memcpy(p, q, 8);
+    if (n <= 8) {
+      p += n;
+      q += n;
+      break;
+    }
+    p += 8;
+    q += 8;
+    n -= 8;
+  }
+  *ptr_iop_w = p;
+  return (uint32_t)wuffs_base__peek_u16le__no_bounds_check(q - 1);
+}
+
+static inline uint32_t  //
+wuffs_private_impl__io_writer__limited_copy_u32_from_reader(
+    uint8_t** ptr_iop_w,
+    uint8_t* io2_w,
+    uint32_t length,
+    const uint8_t** ptr_iop_r,
+    const uint8_t* io2_r) {
   uint8_t* iop_w = *ptr_iop_w;
   size_t n = length;
   if (n > ((size_t)(io2_w - iop_w))) {
@@ -14211,10 +15860,11 @@
 }
 
 static inline uint32_t  //
-wuffs_base__io_writer__limited_copy_u32_from_slice(uint8_t** ptr_iop_w,
-                                                   uint8_t* io2_w,
-                                                   uint32_t length,
-                                                   wuffs_base__slice_u8 src) {
+wuffs_private_impl__io_writer__limited_copy_u32_from_slice(
+    uint8_t** ptr_iop_w,
+    uint8_t* io2_w,
+    uint32_t length,
+    wuffs_base__slice_u8 src) {
   uint8_t* iop_w = *ptr_iop_w;
   size_t n = src.len;
   if (n > length) {
@@ -14231,13 +15881,13 @@
 }
 
 static inline wuffs_base__io_buffer*  //
-wuffs_base__io_writer__set(wuffs_base__io_buffer* b,
-                           uint8_t** ptr_iop_w,
-                           uint8_t** ptr_io0_w,
-                           uint8_t** ptr_io1_w,
-                           uint8_t** ptr_io2_w,
-                           wuffs_base__slice_u8 data,
-                           uint64_t history_position) {
+wuffs_private_impl__io_writer__set(wuffs_base__io_buffer* b,
+                                   uint8_t** ptr_iop_w,
+                                   uint8_t** ptr_io0_w,
+                                   uint8_t** ptr_io1_w,
+                                   uint8_t** ptr_io2_w,
+                                   wuffs_base__slice_u8 data,
+                                   uint64_t history_position) {
   b->data = data;
   b->meta.wi = 0;
   b->meta.ri = 0;
@@ -14337,16 +15987,16 @@
 #if !defined(WUFFS_CONFIG__MODULES) || defined(WUFFS_CONFIG__MODULE__BASE) || \
     defined(WUFFS_CONFIG__MODULE__BASE__CORE)
 
-const uint8_t wuffs_base__low_bits_mask__u8[8] = {
+const uint8_t wuffs_private_impl__low_bits_mask__u8[8] = {
     0x00, 0x01, 0x03, 0x07, 0x0F, 0x1F, 0x3F, 0x7F,
 };
 
-const uint16_t wuffs_base__low_bits_mask__u16[16] = {
+const uint16_t wuffs_private_impl__low_bits_mask__u16[16] = {
     0x0000, 0x0001, 0x0003, 0x0007, 0x000F, 0x001F, 0x003F, 0x007F,
     0x00FF, 0x01FF, 0x03FF, 0x07FF, 0x0FFF, 0x1FFF, 0x3FFF, 0x7FFF,
 };
 
-const uint32_t wuffs_base__low_bits_mask__u32[32] = {
+const uint32_t wuffs_private_impl__low_bits_mask__u32[32] = {
     0x00000000, 0x00000001, 0x00000003, 0x00000007, 0x0000000F, 0x0000001F,
     0x0000003F, 0x0000007F, 0x000000FF, 0x000001FF, 0x000003FF, 0x000007FF,
     0x00000FFF, 0x00001FFF, 0x00003FFF, 0x00007FFF, 0x0000FFFF, 0x0001FFFF,
@@ -14355,7 +16005,7 @@
     0x3FFFFFFF, 0x7FFFFFFF,
 };
 
-const uint64_t wuffs_base__low_bits_mask__u64[64] = {
+const uint64_t wuffs_private_impl__low_bits_mask__u64[64] = {
     0x0000000000000000, 0x0000000000000001, 0x0000000000000003,
     0x0000000000000007, 0x000000000000000F, 0x000000000000001F,
     0x000000000000003F, 0x000000000000007F, 0x00000000000000FF,
@@ -14380,11 +16030,26 @@
     0x7FFFFFFFFFFFFFFF,
 };
 
-const uint32_t wuffs_base__pixel_format__bits_per_channel[16] = {
+const uint32_t wuffs_private_impl__pixel_format__bits_per_channel[16] = {
     0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07,
     0x08, 0x0A, 0x0C, 0x10, 0x18, 0x20, 0x30, 0x40,
 };
 
+const uint8_t  //
+    wuffs_private_impl__placeholder_u8_with_non_null_address = 0;
+
+const uint16_t  //
+    wuffs_private_impl__placeholder_u16_with_non_null_address = 0;
+
+const uint32_t  //
+    wuffs_private_impl__placeholder_u32_with_non_null_address = 0;
+
+const uint64_t  //
+    wuffs_private_impl__placeholder_u64_with_non_null_address = 0;
+
+const wuffs_base__token  //
+    wuffs_private_impl__placeholder_token_with_non_null_address = {0};
+
 const char wuffs_base__note__i_o_redirect[] = "@base: I/O redirect";
 const char wuffs_base__note__end_of_data[] = "@base: end of data";
 const char wuffs_base__note__metadata_reported[] = "@base: metadata reported";
@@ -14392,6 +16057,7 @@
 const char wuffs_base__suspension__mispositioned_read[] = "$base: mispositioned read";
 const char wuffs_base__suspension__mispositioned_write[] = "$base: mispositioned write";
 const char wuffs_base__suspension__short_read[] = "$base: short read";
+const char wuffs_base__suspension__short_workbuf[] = "$base: short workbuf";
 const char wuffs_base__suspension__short_write[] = "$base: short write";
 const char wuffs_base__error__bad_i_o_position[] = "#base: bad I/O position";
 const char wuffs_base__error__bad_argument_length_too_short[] = "#base: bad argument (length too short)";
@@ -14405,9 +16071,11 @@
 const char wuffs_base__error__bad_workbuf_length[] = "#base: bad workbuf length";
 const char wuffs_base__error__bad_wuffs_version[] = "#base: bad wuffs version";
 const char wuffs_base__error__cannot_return_a_suspension[] = "#base: cannot return a suspension";
+const char wuffs_base__error__disabled_by_wuffs_config_dst_pixel_format_enable_allowlist[] = "#base: disabled by WUFFS_CONFIG__DST_PIXEL_FORMAT__ENABLE_ALLOWLIST";
 const char wuffs_base__error__disabled_by_previous_error[] = "#base: disabled by previous error";
 const char wuffs_base__error__initialize_falsely_claimed_already_zeroed[] = "#base: initialize falsely claimed already zeroed";
 const char wuffs_base__error__initialize_not_called[] = "#base: initialize not called";
+const char wuffs_base__error__insufficient_history[] = "#base: insufficient history";
 const char wuffs_base__error__interleaved_coroutine_calls[] = "#base: interleaved coroutine calls";
 const char wuffs_base__error__no_more_information[] = "#base: no more information";
 const char wuffs_base__error__not_enough_data[] = "#base: not enough data";
@@ -14420,6 +16088,7 @@
 
 const char wuffs_base__hasher_u32__vtable_name[] = "{vtable}wuffs_base__hasher_u32";
 const char wuffs_base__hasher_u64__vtable_name[] = "{vtable}wuffs_base__hasher_u64";
+const char wuffs_base__hasher_bitvec256__vtable_name[] = "{vtable}wuffs_base__hasher_bitvec256";
 const char wuffs_base__image_decoder__vtable_name[] = "{vtable}wuffs_base__image_decoder";
 const char wuffs_base__io_transformer__vtable_name[] = "{vtable}wuffs_base__io_transformer";
 const char wuffs_base__token_decoder__vtable_name[] = "{vtable}wuffs_base__token_decoder";
@@ -14728,6 +16397,153 @@
 // --------
 
 WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__bitvec256
+wuffs_base__hasher_bitvec256__checksum_bitvec256(
+    const wuffs_base__hasher_bitvec256* self) {
+  if (!self) {
+    return wuffs_base__utility__make_bitvec256(0u, 0u, 0u, 0u);
+  }
+  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
+      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
+    return wuffs_base__utility__make_bitvec256(0u, 0u, 0u, 0u);
+  }
+
+  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
+  int i;
+  for (i = 0; i < 63; i++) {
+    if (v->vtable_name == wuffs_base__hasher_bitvec256__vtable_name) {
+      const wuffs_base__hasher_bitvec256__func_ptrs* func_ptrs =
+          (const wuffs_base__hasher_bitvec256__func_ptrs*)(v->function_pointers);
+      return (*func_ptrs->checksum_bitvec256)(self);
+    } else if (v->vtable_name == NULL) {
+      break;
+    }
+    v++;
+  }
+
+  return wuffs_base__utility__make_bitvec256(0u, 0u, 0u, 0u);
+}
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC uint64_t
+wuffs_base__hasher_bitvec256__get_quirk(
+    const wuffs_base__hasher_bitvec256* self,
+    uint32_t a_key) {
+  if (!self) {
+    return 0;
+  }
+  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
+      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
+    return 0;
+  }
+
+  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
+  int i;
+  for (i = 0; i < 63; i++) {
+    if (v->vtable_name == wuffs_base__hasher_bitvec256__vtable_name) {
+      const wuffs_base__hasher_bitvec256__func_ptrs* func_ptrs =
+          (const wuffs_base__hasher_bitvec256__func_ptrs*)(v->function_pointers);
+      return (*func_ptrs->get_quirk)(self, a_key);
+    } else if (v->vtable_name == NULL) {
+      break;
+    }
+    v++;
+  }
+
+  return 0;
+}
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__status
+wuffs_base__hasher_bitvec256__set_quirk(
+    wuffs_base__hasher_bitvec256* self,
+    uint32_t a_key,
+    uint64_t a_value) {
+  if (!self) {
+    return wuffs_base__make_status(wuffs_base__error__bad_receiver);
+  }
+  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
+    return wuffs_base__make_status(
+        (self->private_impl.magic == WUFFS_BASE__DISABLED)
+            ? wuffs_base__error__disabled_by_previous_error
+            : wuffs_base__error__initialize_not_called);
+  }
+
+  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
+  int i;
+  for (i = 0; i < 63; i++) {
+    if (v->vtable_name == wuffs_base__hasher_bitvec256__vtable_name) {
+      const wuffs_base__hasher_bitvec256__func_ptrs* func_ptrs =
+          (const wuffs_base__hasher_bitvec256__func_ptrs*)(v->function_pointers);
+      return (*func_ptrs->set_quirk)(self, a_key, a_value);
+    } else if (v->vtable_name == NULL) {
+      break;
+    }
+    v++;
+  }
+
+  return wuffs_base__make_status(wuffs_base__error__bad_vtable);
+}
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__empty_struct
+wuffs_base__hasher_bitvec256__update(
+    wuffs_base__hasher_bitvec256* self,
+    wuffs_base__slice_u8 a_x) {
+  if (!self) {
+    return wuffs_base__make_empty_struct();
+  }
+  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
+    return wuffs_base__make_empty_struct();
+  }
+
+  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
+  int i;
+  for (i = 0; i < 63; i++) {
+    if (v->vtable_name == wuffs_base__hasher_bitvec256__vtable_name) {
+      const wuffs_base__hasher_bitvec256__func_ptrs* func_ptrs =
+          (const wuffs_base__hasher_bitvec256__func_ptrs*)(v->function_pointers);
+      return (*func_ptrs->update)(self, a_x);
+    } else if (v->vtable_name == NULL) {
+      break;
+    }
+    v++;
+  }
+
+  return wuffs_base__make_empty_struct();
+}
+
+WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__bitvec256
+wuffs_base__hasher_bitvec256__update_bitvec256(
+    wuffs_base__hasher_bitvec256* self,
+    wuffs_base__slice_u8 a_x) {
+  if (!self) {
+    return wuffs_base__utility__make_bitvec256(0u, 0u, 0u, 0u);
+  }
+  if (self->private_impl.magic != WUFFS_BASE__MAGIC) {
+    return wuffs_base__utility__make_bitvec256(0u, 0u, 0u, 0u);
+  }
+
+  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
+  int i;
+  for (i = 0; i < 63; i++) {
+    if (v->vtable_name == wuffs_base__hasher_bitvec256__vtable_name) {
+      const wuffs_base__hasher_bitvec256__func_ptrs* func_ptrs =
+          (const wuffs_base__hasher_bitvec256__func_ptrs*)(v->function_pointers);
+      return (*func_ptrs->update_bitvec256)(self, a_x);
+    } else if (v->vtable_name == NULL) {
+      break;
+    }
+    v++;
+  }
+
+  return wuffs_base__utility__make_bitvec256(0u, 0u, 0u, 0u);
+}
+
+// --------
+
+WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC wuffs_base__status
 wuffs_base__image_decoder__decode_frame(
     wuffs_base__image_decoder* self,
@@ -14884,34 +16700,6 @@
 }
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__image_decoder__history_retain_length(
-    const wuffs_base__image_decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__image_decoder__vtable_name) {
-      const wuffs_base__image_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__image_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->history_retain_length)(self);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return 0;
-}
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC uint32_t
 wuffs_base__image_decoder__num_animation_loops(
     const wuffs_base__image_decoder* self) {
@@ -15152,6 +16940,34 @@
 // --------
 
 WUFFS_BASE__GENERATED_C_CODE
+WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63
+wuffs_base__io_transformer__dst_history_retain_length(
+    const wuffs_base__io_transformer* self) {
+  if (!self) {
+    return wuffs_base__utility__make_optional_u63(false, 0u);
+  }
+  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
+      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
+    return wuffs_base__utility__make_optional_u63(false, 0u);
+  }
+
+  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
+  int i;
+  for (i = 0; i < 63; i++) {
+    if (v->vtable_name == wuffs_base__io_transformer__vtable_name) {
+      const wuffs_base__io_transformer__func_ptrs* func_ptrs =
+          (const wuffs_base__io_transformer__func_ptrs*)(v->function_pointers);
+      return (*func_ptrs->dst_history_retain_length)(self);
+    } else if (v->vtable_name == NULL) {
+      break;
+    }
+    v++;
+  }
+
+  return wuffs_base__utility__make_optional_u63(false, 0u);
+}
+
+WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC uint64_t
 wuffs_base__io_transformer__get_quirk(
     const wuffs_base__io_transformer* self,
@@ -15181,34 +16997,6 @@
 }
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__io_transformer__history_retain_length(
-    const wuffs_base__io_transformer* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__io_transformer__vtable_name) {
-      const wuffs_base__io_transformer__func_ptrs* func_ptrs =
-          (const wuffs_base__io_transformer__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->history_retain_length)(self);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return 0;
-}
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC wuffs_base__status
 wuffs_base__io_transformer__set_quirk(
     wuffs_base__io_transformer* self,
@@ -15366,34 +17154,6 @@
 }
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_base__token_decoder__history_retain_length(
-    const wuffs_base__token_decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  const wuffs_base__vtable* v = &self->private_impl.first_vtable;
-  int i;
-  for (i = 0; i < 63; i++) {
-    if (v->vtable_name == wuffs_base__token_decoder__vtable_name) {
-      const wuffs_base__token_decoder__func_ptrs* func_ptrs =
-          (const wuffs_base__token_decoder__func_ptrs*)(v->function_pointers);
-      return (*func_ptrs->history_retain_length)(self);
-    } else if (v->vtable_name == NULL) {
-      break;
-    }
-    v++;
-  }
-
-  return 0;
-}
-
-WUFFS_BASE__GENERATED_C_CODE
 WUFFS_BASE__MAYBE_STATIC wuffs_base__status
 wuffs_base__token_decoder__set_quirk(
     wuffs_base__token_decoder* self,
@@ -15467,14 +17227,14 @@
 // whose output is not copied here, which prints further detail.
 //
 // These tables are used in
-// wuffs_base__private_implementation__high_prec_dec__lshift_num_new_digits.
+// wuffs_private_impl__high_prec_dec__lshift_num_new_digits.
 
-// wuffs_base__private_implementation__hpd_left_shift[i] encodes the number of
-// new digits created after multiplying a positive integer by (1 << i): the
-// additional length in the decimal representation. For example, shifting "234"
-// by 3 (equivalent to multiplying by 8) will produce "1872". Going from a
-// 3-length string to a 4-length string means that 1 new digit was added (and
-// existing digits may have changed).
+// wuffs_private_impl__hpd_left_shift[i] encodes the number of new digits
+// created after multiplying a positive integer by (1 << i): the additional
+// length in the decimal representation. For example, shifting "234" by 3
+// (equivalent to multiplying by 8) will produce "1872". Going from a 3-length
+// string to a 4-length string means that 1 new digit was added (and existing
+// digits may have changed).
 //
 // Shifting by i can add either N or N-1 new digits, depending on whether the
 // original positive integer compares >= or < to the i'th power of 5 (as 10
@@ -15504,7 +17264,7 @@
 // is the string "\x06\x02\x05", so the relevant power of 5 is "625".
 //
 // Thanks to Ken Thompson for the original idea.
-static const uint16_t wuffs_base__private_implementation__hpd_left_shift[65] = {
+static const uint16_t wuffs_private_impl__hpd_left_shift[65] = {
     0x0000, 0x0800, 0x0801, 0x0803, 0x1006, 0x1009, 0x100D, 0x1812, 0x1817,
     0x181D, 0x2024, 0x202B, 0x2033, 0x203C, 0x2846, 0x2850, 0x285B, 0x3067,
     0x3073, 0x3080, 0x388E, 0x389C, 0x38AB, 0x38BB, 0x40CC, 0x40DD, 0x40EF,
@@ -15515,9 +17275,9 @@
     0x051C, 0x051C,
 };
 
-// wuffs_base__private_implementation__powers_of_5 contains the powers of 5,
-// concatenated together: "5", "25", "125", "625", "3125", etc.
-static const uint8_t wuffs_base__private_implementation__powers_of_5[0x051C] = {
+// wuffs_private_impl__powers_of_5 contains the powers of 5, concatenated
+// together: "5", "25", "125", "625", "3125", etc.
+static const uint8_t wuffs_private_impl__powers_of_5[0x051C] = {
     5, 2, 5, 1, 2, 5, 6, 2, 5, 3, 1, 2, 5, 1, 5, 6, 2, 5, 7, 8, 1, 2, 5, 3, 9,
     0, 6, 2, 5, 1, 9, 5, 3, 1, 2, 5, 9, 7, 6, 5, 6, 2, 5, 4, 8, 8, 2, 8, 1, 2,
     5, 2, 4, 4, 1, 4, 0, 6, 2, 5, 1, 2, 2, 0, 7, 0, 3, 1, 2, 5, 6, 1, 0, 3, 5,
@@ -15575,15 +17335,15 @@
 
 // --------
 
-// wuffs_base__private_implementation__powers_of_10 contains truncated
-// approximations to the powers of 10, ranging from 1e-307 to 1e+288 inclusive,
-// as 596 pairs of uint64_t values (a 128-bit mantissa).
+// wuffs_private_impl__powers_of_10 contains truncated approximations to the
+// powers of 10, ranging from 1e-307 to 1e+288 inclusive, as 596 pairs of
+// uint64_t values (a 128-bit mantissa).
 //
 // There's also an implicit third column (implied by a linear formula involving
 // the base-10 exponent) that is the base-2 exponent, biased by a magic
 // constant. That constant (1214 or 0x04BE) equals 1023 + 191. 1023 is the bias
 // for IEEE 754 double-precision floating point. 191 is ((3 * 64) - 1) and
-// wuffs_base__private_implementation__parse_number_f64_eisel_lemire works with
+// wuffs_private_impl__parse_number_f64_eisel_lemire works with
 // multiples-of-64-bit mantissas.
 //
 // For example, the third row holds the approximation to 1e-305:
@@ -15596,609 +17356,608 @@
 //   0xED63A231_D4C4FB27_4CA7AAA8_63EE4BDD * (2 ** (0x0520 - 0x04BE))
 //
 // This table was generated by by script/print-mpb-powers-of-10.go
-static const uint64_t wuffs_base__private_implementation__powers_of_10[596][2] =
-    {
-        {0xA5D3B6D479F8E056, 0x8FD0C16206306BAB},  // 1e-307
-        {0x8F48A4899877186C, 0xB3C4F1BA87BC8696},  // 1e-306
-        {0x331ACDABFE94DE87, 0xE0B62E2929ABA83C},  // 1e-305
-        {0x9FF0C08B7F1D0B14, 0x8C71DCD9BA0B4925},  // 1e-304
-        {0x07ECF0AE5EE44DD9, 0xAF8E5410288E1B6F},  // 1e-303
-        {0xC9E82CD9F69D6150, 0xDB71E91432B1A24A},  // 1e-302
-        {0xBE311C083A225CD2, 0x892731AC9FAF056E},  // 1e-301
-        {0x6DBD630A48AAF406, 0xAB70FE17C79AC6CA},  // 1e-300
-        {0x092CBBCCDAD5B108, 0xD64D3D9DB981787D},  // 1e-299
-        {0x25BBF56008C58EA5, 0x85F0468293F0EB4E},  // 1e-298
-        {0xAF2AF2B80AF6F24E, 0xA76C582338ED2621},  // 1e-297
-        {0x1AF5AF660DB4AEE1, 0xD1476E2C07286FAA},  // 1e-296
-        {0x50D98D9FC890ED4D, 0x82CCA4DB847945CA},  // 1e-295
-        {0xE50FF107BAB528A0, 0xA37FCE126597973C},  // 1e-294
-        {0x1E53ED49A96272C8, 0xCC5FC196FEFD7D0C},  // 1e-293
-        {0x25E8E89C13BB0F7A, 0xFF77B1FCBEBCDC4F},  // 1e-292
-        {0x77B191618C54E9AC, 0x9FAACF3DF73609B1},  // 1e-291
-        {0xD59DF5B9EF6A2417, 0xC795830D75038C1D},  // 1e-290
-        {0x4B0573286B44AD1D, 0xF97AE3D0D2446F25},  // 1e-289
-        {0x4EE367F9430AEC32, 0x9BECCE62836AC577},  // 1e-288
-        {0x229C41F793CDA73F, 0xC2E801FB244576D5},  // 1e-287
-        {0x6B43527578C1110F, 0xF3A20279ED56D48A},  // 1e-286
-        {0x830A13896B78AAA9, 0x9845418C345644D6},  // 1e-285
-        {0x23CC986BC656D553, 0xBE5691EF416BD60C},  // 1e-284
-        {0x2CBFBE86B7EC8AA8, 0xEDEC366B11C6CB8F},  // 1e-283
-        {0x7BF7D71432F3D6A9, 0x94B3A202EB1C3F39},  // 1e-282
-        {0xDAF5CCD93FB0CC53, 0xB9E08A83A5E34F07},  // 1e-281
-        {0xD1B3400F8F9CFF68, 0xE858AD248F5C22C9},  // 1e-280
-        {0x23100809B9C21FA1, 0x91376C36D99995BE},  // 1e-279
-        {0xABD40A0C2832A78A, 0xB58547448FFFFB2D},  // 1e-278
-        {0x16C90C8F323F516C, 0xE2E69915B3FFF9F9},  // 1e-277
-        {0xAE3DA7D97F6792E3, 0x8DD01FAD907FFC3B},  // 1e-276
-        {0x99CD11CFDF41779C, 0xB1442798F49FFB4A},  // 1e-275
-        {0x40405643D711D583, 0xDD95317F31C7FA1D},  // 1e-274
-        {0x482835EA666B2572, 0x8A7D3EEF7F1CFC52},  // 1e-273
-        {0xDA3243650005EECF, 0xAD1C8EAB5EE43B66},  // 1e-272
-        {0x90BED43E40076A82, 0xD863B256369D4A40},  // 1e-271
-        {0x5A7744A6E804A291, 0x873E4F75E2224E68},  // 1e-270
-        {0x711515D0A205CB36, 0xA90DE3535AAAE202},  // 1e-269
-        {0x0D5A5B44CA873E03, 0xD3515C2831559A83},  // 1e-268
-        {0xE858790AFE9486C2, 0x8412D9991ED58091},  // 1e-267
-        {0x626E974DBE39A872, 0xA5178FFF668AE0B6},  // 1e-266
-        {0xFB0A3D212DC8128F, 0xCE5D73FF402D98E3},  // 1e-265
-        {0x7CE66634BC9D0B99, 0x80FA687F881C7F8E},  // 1e-264
-        {0x1C1FFFC1EBC44E80, 0xA139029F6A239F72},  // 1e-263
-        {0xA327FFB266B56220, 0xC987434744AC874E},  // 1e-262
-        {0x4BF1FF9F0062BAA8, 0xFBE9141915D7A922},  // 1e-261
-        {0x6F773FC3603DB4A9, 0x9D71AC8FADA6C9B5},  // 1e-260
-        {0xCB550FB4384D21D3, 0xC4CE17B399107C22},  // 1e-259
-        {0x7E2A53A146606A48, 0xF6019DA07F549B2B},  // 1e-258
-        {0x2EDA7444CBFC426D, 0x99C102844F94E0FB},  // 1e-257
-        {0xFA911155FEFB5308, 0xC0314325637A1939},  // 1e-256
-        {0x793555AB7EBA27CA, 0xF03D93EEBC589F88},  // 1e-255
-        {0x4BC1558B2F3458DE, 0x96267C7535B763B5},  // 1e-254
-        {0x9EB1AAEDFB016F16, 0xBBB01B9283253CA2},  // 1e-253
-        {0x465E15A979C1CADC, 0xEA9C227723EE8BCB},  // 1e-252
-        {0x0BFACD89EC191EC9, 0x92A1958A7675175F},  // 1e-251
-        {0xCEF980EC671F667B, 0xB749FAED14125D36},  // 1e-250
-        {0x82B7E12780E7401A, 0xE51C79A85916F484},  // 1e-249
-        {0xD1B2ECB8B0908810, 0x8F31CC0937AE58D2},  // 1e-248
-        {0x861FA7E6DCB4AA15, 0xB2FE3F0B8599EF07},  // 1e-247
-        {0x67A791E093E1D49A, 0xDFBDCECE67006AC9},  // 1e-246
-        {0xE0C8BB2C5C6D24E0, 0x8BD6A141006042BD},  // 1e-245
-        {0x58FAE9F773886E18, 0xAECC49914078536D},  // 1e-244
-        {0xAF39A475506A899E, 0xDA7F5BF590966848},  // 1e-243
-        {0x6D8406C952429603, 0x888F99797A5E012D},  // 1e-242
-        {0xC8E5087BA6D33B83, 0xAAB37FD7D8F58178},  // 1e-241
-        {0xFB1E4A9A90880A64, 0xD5605FCDCF32E1D6},  // 1e-240
-        {0x5CF2EEA09A55067F, 0x855C3BE0A17FCD26},  // 1e-239
-        {0xF42FAA48C0EA481E, 0xA6B34AD8C9DFC06F},  // 1e-238
-        {0xF13B94DAF124DA26, 0xD0601D8EFC57B08B},  // 1e-237
-        {0x76C53D08D6B70858, 0x823C12795DB6CE57},  // 1e-236
-        {0x54768C4B0C64CA6E, 0xA2CB1717B52481ED},  // 1e-235
-        {0xA9942F5DCF7DFD09, 0xCB7DDCDDA26DA268},  // 1e-234
-        {0xD3F93B35435D7C4C, 0xFE5D54150B090B02},  // 1e-233
-        {0xC47BC5014A1A6DAF, 0x9EFA548D26E5A6E1},  // 1e-232
-        {0x359AB6419CA1091B, 0xC6B8E9B0709F109A},  // 1e-231
-        {0xC30163D203C94B62, 0xF867241C8CC6D4C0},  // 1e-230
-        {0x79E0DE63425DCF1D, 0x9B407691D7FC44F8},  // 1e-229
-        {0x985915FC12F542E4, 0xC21094364DFB5636},  // 1e-228
-        {0x3E6F5B7B17B2939D, 0xF294B943E17A2BC4},  // 1e-227
-        {0xA705992CEECF9C42, 0x979CF3CA6CEC5B5A},  // 1e-226
-        {0x50C6FF782A838353, 0xBD8430BD08277231},  // 1e-225
-        {0xA4F8BF5635246428, 0xECE53CEC4A314EBD},  // 1e-224
-        {0x871B7795E136BE99, 0x940F4613AE5ED136},  // 1e-223
-        {0x28E2557B59846E3F, 0xB913179899F68584},  // 1e-222
-        {0x331AEADA2FE589CF, 0xE757DD7EC07426E5},  // 1e-221
-        {0x3FF0D2C85DEF7621, 0x9096EA6F3848984F},  // 1e-220
-        {0x0FED077A756B53A9, 0xB4BCA50B065ABE63},  // 1e-219
-        {0xD3E8495912C62894, 0xE1EBCE4DC7F16DFB},  // 1e-218
-        {0x64712DD7ABBBD95C, 0x8D3360F09CF6E4BD},  // 1e-217
-        {0xBD8D794D96AACFB3, 0xB080392CC4349DEC},  // 1e-216
-        {0xECF0D7A0FC5583A0, 0xDCA04777F541C567},  // 1e-215
-        {0xF41686C49DB57244, 0x89E42CAAF9491B60},  // 1e-214
-        {0x311C2875C522CED5, 0xAC5D37D5B79B6239},  // 1e-213
-        {0x7D633293366B828B, 0xD77485CB25823AC7},  // 1e-212
-        {0xAE5DFF9C02033197, 0x86A8D39EF77164BC},  // 1e-211
-        {0xD9F57F830283FDFC, 0xA8530886B54DBDEB},  // 1e-210
-        {0xD072DF63C324FD7B, 0xD267CAA862A12D66},  // 1e-209
-        {0x4247CB9E59F71E6D, 0x8380DEA93DA4BC60},  // 1e-208
-        {0x52D9BE85F074E608, 0xA46116538D0DEB78},  // 1e-207
-        {0x67902E276C921F8B, 0xCD795BE870516656},  // 1e-206
-        {0x00BA1CD8A3DB53B6, 0x806BD9714632DFF6},  // 1e-205
-        {0x80E8A40ECCD228A4, 0xA086CFCD97BF97F3},  // 1e-204
-        {0x6122CD128006B2CD, 0xC8A883C0FDAF7DF0},  // 1e-203
-        {0x796B805720085F81, 0xFAD2A4B13D1B5D6C},  // 1e-202
-        {0xCBE3303674053BB0, 0x9CC3A6EEC6311A63},  // 1e-201
-        {0xBEDBFC4411068A9C, 0xC3F490AA77BD60FC},  // 1e-200
-        {0xEE92FB5515482D44, 0xF4F1B4D515ACB93B},  // 1e-199
-        {0x751BDD152D4D1C4A, 0x991711052D8BF3C5},  // 1e-198
-        {0xD262D45A78A0635D, 0xBF5CD54678EEF0B6},  // 1e-197
-        {0x86FB897116C87C34, 0xEF340A98172AACE4},  // 1e-196
-        {0xD45D35E6AE3D4DA0, 0x9580869F0E7AAC0E},  // 1e-195
-        {0x8974836059CCA109, 0xBAE0A846D2195712},  // 1e-194
-        {0x2BD1A438703FC94B, 0xE998D258869FACD7},  // 1e-193
-        {0x7B6306A34627DDCF, 0x91FF83775423CC06},  // 1e-192
-        {0x1A3BC84C17B1D542, 0xB67F6455292CBF08},  // 1e-191
-        {0x20CABA5F1D9E4A93, 0xE41F3D6A7377EECA},  // 1e-190
-        {0x547EB47B7282EE9C, 0x8E938662882AF53E},  // 1e-189
-        {0xE99E619A4F23AA43, 0xB23867FB2A35B28D},  // 1e-188
-        {0x6405FA00E2EC94D4, 0xDEC681F9F4C31F31},  // 1e-187
-        {0xDE83BC408DD3DD04, 0x8B3C113C38F9F37E},  // 1e-186
-        {0x9624AB50B148D445, 0xAE0B158B4738705E},  // 1e-185
-        {0x3BADD624DD9B0957, 0xD98DDAEE19068C76},  // 1e-184
-        {0xE54CA5D70A80E5D6, 0x87F8A8D4CFA417C9},  // 1e-183
-        {0x5E9FCF4CCD211F4C, 0xA9F6D30A038D1DBC},  // 1e-182
-        {0x7647C3200069671F, 0xD47487CC8470652B},  // 1e-181
-        {0x29ECD9F40041E073, 0x84C8D4DFD2C63F3B},  // 1e-180
-        {0xF468107100525890, 0xA5FB0A17C777CF09},  // 1e-179
-        {0x7182148D4066EEB4, 0xCF79CC9DB955C2CC},  // 1e-178
-        {0xC6F14CD848405530, 0x81AC1FE293D599BF},  // 1e-177
-        {0xB8ADA00E5A506A7C, 0xA21727DB38CB002F},  // 1e-176
-        {0xA6D90811F0E4851C, 0xCA9CF1D206FDC03B},  // 1e-175
-        {0x908F4A166D1DA663, 0xFD442E4688BD304A},  // 1e-174
-        {0x9A598E4E043287FE, 0x9E4A9CEC15763E2E},  // 1e-173
-        {0x40EFF1E1853F29FD, 0xC5DD44271AD3CDBA},  // 1e-172
-        {0xD12BEE59E68EF47C, 0xF7549530E188C128},  // 1e-171
-        {0x82BB74F8301958CE, 0x9A94DD3E8CF578B9},  // 1e-170
-        {0xE36A52363C1FAF01, 0xC13A148E3032D6E7},  // 1e-169
-        {0xDC44E6C3CB279AC1, 0xF18899B1BC3F8CA1},  // 1e-168
-        {0x29AB103A5EF8C0B9, 0x96F5600F15A7B7E5},  // 1e-167
-        {0x7415D448F6B6F0E7, 0xBCB2B812DB11A5DE},  // 1e-166
-        {0x111B495B3464AD21, 0xEBDF661791D60F56},  // 1e-165
-        {0xCAB10DD900BEEC34, 0x936B9FCEBB25C995},  // 1e-164
-        {0x3D5D514F40EEA742, 0xB84687C269EF3BFB},  // 1e-163
-        {0x0CB4A5A3112A5112, 0xE65829B3046B0AFA},  // 1e-162
-        {0x47F0E785EABA72AB, 0x8FF71A0FE2C2E6DC},  // 1e-161
-        {0x59ED216765690F56, 0xB3F4E093DB73A093},  // 1e-160
-        {0x306869C13EC3532C, 0xE0F218B8D25088B8},  // 1e-159
-        {0x1E414218C73A13FB, 0x8C974F7383725573},  // 1e-158
-        {0xE5D1929EF90898FA, 0xAFBD2350644EEACF},  // 1e-157
-        {0xDF45F746B74ABF39, 0xDBAC6C247D62A583},  // 1e-156
-        {0x6B8BBA8C328EB783, 0x894BC396CE5DA772},  // 1e-155
-        {0x066EA92F3F326564, 0xAB9EB47C81F5114F},  // 1e-154
-        {0xC80A537B0EFEFEBD, 0xD686619BA27255A2},  // 1e-153
-        {0xBD06742CE95F5F36, 0x8613FD0145877585},  // 1e-152
-        {0x2C48113823B73704, 0xA798FC4196E952E7},  // 1e-151
-        {0xF75A15862CA504C5, 0xD17F3B51FCA3A7A0},  // 1e-150
-        {0x9A984D73DBE722FB, 0x82EF85133DE648C4},  // 1e-149
-        {0xC13E60D0D2E0EBBA, 0xA3AB66580D5FDAF5},  // 1e-148
-        {0x318DF905079926A8, 0xCC963FEE10B7D1B3},  // 1e-147
-        {0xFDF17746497F7052, 0xFFBBCFE994E5C61F},  // 1e-146
-        {0xFEB6EA8BEDEFA633, 0x9FD561F1FD0F9BD3},  // 1e-145
-        {0xFE64A52EE96B8FC0, 0xC7CABA6E7C5382C8},  // 1e-144
-        {0x3DFDCE7AA3C673B0, 0xF9BD690A1B68637B},  // 1e-143
-        {0x06BEA10CA65C084E, 0x9C1661A651213E2D},  // 1e-142
-        {0x486E494FCFF30A62, 0xC31BFA0FE5698DB8},  // 1e-141
-        {0x5A89DBA3C3EFCCFA, 0xF3E2F893DEC3F126},  // 1e-140
-        {0xF89629465A75E01C, 0x986DDB5C6B3A76B7},  // 1e-139
-        {0xF6BBB397F1135823, 0xBE89523386091465},  // 1e-138
-        {0x746AA07DED582E2C, 0xEE2BA6C0678B597F},  // 1e-137
-        {0xA8C2A44EB4571CDC, 0x94DB483840B717EF},  // 1e-136
-        {0x92F34D62616CE413, 0xBA121A4650E4DDEB},  // 1e-135
-        {0x77B020BAF9C81D17, 0xE896A0D7E51E1566},  // 1e-134
-        {0x0ACE1474DC1D122E, 0x915E2486EF32CD60},  // 1e-133
-        {0x0D819992132456BA, 0xB5B5ADA8AAFF80B8},  // 1e-132
-        {0x10E1FFF697ED6C69, 0xE3231912D5BF60E6},  // 1e-131
-        {0xCA8D3FFA1EF463C1, 0x8DF5EFABC5979C8F},  // 1e-130
-        {0xBD308FF8A6B17CB2, 0xB1736B96B6FD83B3},  // 1e-129
-        {0xAC7CB3F6D05DDBDE, 0xDDD0467C64BCE4A0},  // 1e-128
-        {0x6BCDF07A423AA96B, 0x8AA22C0DBEF60EE4},  // 1e-127
-        {0x86C16C98D2C953C6, 0xAD4AB7112EB3929D},  // 1e-126
-        {0xE871C7BF077BA8B7, 0xD89D64D57A607744},  // 1e-125
-        {0x11471CD764AD4972, 0x87625F056C7C4A8B},  // 1e-124
-        {0xD598E40D3DD89BCF, 0xA93AF6C6C79B5D2D},  // 1e-123
-        {0x4AFF1D108D4EC2C3, 0xD389B47879823479},  // 1e-122
-        {0xCEDF722A585139BA, 0x843610CB4BF160CB},  // 1e-121
-        {0xC2974EB4EE658828, 0xA54394FE1EEDB8FE},  // 1e-120
-        {0x733D226229FEEA32, 0xCE947A3DA6A9273E},  // 1e-119
-        {0x0806357D5A3F525F, 0x811CCC668829B887},  // 1e-118
-        {0xCA07C2DCB0CF26F7, 0xA163FF802A3426A8},  // 1e-117
-        {0xFC89B393DD02F0B5, 0xC9BCFF6034C13052},  // 1e-116
-        {0xBBAC2078D443ACE2, 0xFC2C3F3841F17C67},  // 1e-115
-        {0xD54B944B84AA4C0D, 0x9D9BA7832936EDC0},  // 1e-114
-        {0x0A9E795E65D4DF11, 0xC5029163F384A931},  // 1e-113
-        {0x4D4617B5FF4A16D5, 0xF64335BCF065D37D},  // 1e-112
-        {0x504BCED1BF8E4E45, 0x99EA0196163FA42E},  // 1e-111
-        {0xE45EC2862F71E1D6, 0xC06481FB9BCF8D39},  // 1e-110
-        {0x5D767327BB4E5A4C, 0xF07DA27A82C37088},  // 1e-109
-        {0x3A6A07F8D510F86F, 0x964E858C91BA2655},  // 1e-108
-        {0x890489F70A55368B, 0xBBE226EFB628AFEA},  // 1e-107
-        {0x2B45AC74CCEA842E, 0xEADAB0ABA3B2DBE5},  // 1e-106
-        {0x3B0B8BC90012929D, 0x92C8AE6B464FC96F},  // 1e-105
-        {0x09CE6EBB40173744, 0xB77ADA0617E3BBCB},  // 1e-104
-        {0xCC420A6A101D0515, 0xE55990879DDCAABD},  // 1e-103
-        {0x9FA946824A12232D, 0x8F57FA54C2A9EAB6},  // 1e-102
-        {0x47939822DC96ABF9, 0xB32DF8E9F3546564},  // 1e-101
-        {0x59787E2B93BC56F7, 0xDFF9772470297EBD},  // 1e-100
-        {0x57EB4EDB3C55B65A, 0x8BFBEA76C619EF36},  // 1e-99
-        {0xEDE622920B6B23F1, 0xAEFAE51477A06B03},  // 1e-98
-        {0xE95FAB368E45ECED, 0xDAB99E59958885C4},  // 1e-97
-        {0x11DBCB0218EBB414, 0x88B402F7FD75539B},  // 1e-96
-        {0xD652BDC29F26A119, 0xAAE103B5FCD2A881},  // 1e-95
-        {0x4BE76D3346F0495F, 0xD59944A37C0752A2},  // 1e-94
-        {0x6F70A4400C562DDB, 0x857FCAE62D8493A5},  // 1e-93
-        {0xCB4CCD500F6BB952, 0xA6DFBD9FB8E5B88E},  // 1e-92
-        {0x7E2000A41346A7A7, 0xD097AD07A71F26B2},  // 1e-91
-        {0x8ED400668C0C28C8, 0x825ECC24C873782F},  // 1e-90
-        {0x728900802F0F32FA, 0xA2F67F2DFA90563B},  // 1e-89
-        {0x4F2B40A03AD2FFB9, 0xCBB41EF979346BCA},  // 1e-88
-        {0xE2F610C84987BFA8, 0xFEA126B7D78186BC},  // 1e-87
-        {0x0DD9CA7D2DF4D7C9, 0x9F24B832E6B0F436},  // 1e-86
-        {0x91503D1C79720DBB, 0xC6EDE63FA05D3143},  // 1e-85
-        {0x75A44C6397CE912A, 0xF8A95FCF88747D94},  // 1e-84
-        {0xC986AFBE3EE11ABA, 0x9B69DBE1B548CE7C},  // 1e-83
-        {0xFBE85BADCE996168, 0xC24452DA229B021B},  // 1e-82
-        {0xFAE27299423FB9C3, 0xF2D56790AB41C2A2},  // 1e-81
-        {0xDCCD879FC967D41A, 0x97C560BA6B0919A5},  // 1e-80
-        {0x5400E987BBC1C920, 0xBDB6B8E905CB600F},  // 1e-79
-        {0x290123E9AAB23B68, 0xED246723473E3813},  // 1e-78
-        {0xF9A0B6720AAF6521, 0x9436C0760C86E30B},  // 1e-77
-        {0xF808E40E8D5B3E69, 0xB94470938FA89BCE},  // 1e-76
-        {0xB60B1D1230B20E04, 0xE7958CB87392C2C2},  // 1e-75
-        {0xB1C6F22B5E6F48C2, 0x90BD77F3483BB9B9},  // 1e-74
-        {0x1E38AEB6360B1AF3, 0xB4ECD5F01A4AA828},  // 1e-73
-        {0x25C6DA63C38DE1B0, 0xE2280B6C20DD5232},  // 1e-72
-        {0x579C487E5A38AD0E, 0x8D590723948A535F},  // 1e-71
-        {0x2D835A9DF0C6D851, 0xB0AF48EC79ACE837},  // 1e-70
-        {0xF8E431456CF88E65, 0xDCDB1B2798182244},  // 1e-69
-        {0x1B8E9ECB641B58FF, 0x8A08F0F8BF0F156B},  // 1e-68
-        {0xE272467E3D222F3F, 0xAC8B2D36EED2DAC5},  // 1e-67
-        {0x5B0ED81DCC6ABB0F, 0xD7ADF884AA879177},  // 1e-66
-        {0x98E947129FC2B4E9, 0x86CCBB52EA94BAEA},  // 1e-65
-        {0x3F2398D747B36224, 0xA87FEA27A539E9A5},  // 1e-64
-        {0x8EEC7F0D19A03AAD, 0xD29FE4B18E88640E},  // 1e-63
-        {0x1953CF68300424AC, 0x83A3EEEEF9153E89},  // 1e-62
-        {0x5FA8C3423C052DD7, 0xA48CEAAAB75A8E2B},  // 1e-61
-        {0x3792F412CB06794D, 0xCDB02555653131B6},  // 1e-60
-        {0xE2BBD88BBEE40BD0, 0x808E17555F3EBF11},  // 1e-59
-        {0x5B6ACEAEAE9D0EC4, 0xA0B19D2AB70E6ED6},  // 1e-58
-        {0xF245825A5A445275, 0xC8DE047564D20A8B},  // 1e-57
-        {0xEED6E2F0F0D56712, 0xFB158592BE068D2E},  // 1e-56
-        {0x55464DD69685606B, 0x9CED737BB6C4183D},  // 1e-55
-        {0xAA97E14C3C26B886, 0xC428D05AA4751E4C},  // 1e-54
-        {0xD53DD99F4B3066A8, 0xF53304714D9265DF},  // 1e-53
-        {0xE546A8038EFE4029, 0x993FE2C6D07B7FAB},  // 1e-52
-        {0xDE98520472BDD033, 0xBF8FDB78849A5F96},  // 1e-51
-        {0x963E66858F6D4440, 0xEF73D256A5C0F77C},  // 1e-50
-        {0xDDE7001379A44AA8, 0x95A8637627989AAD},  // 1e-49
-        {0x5560C018580D5D52, 0xBB127C53B17EC159},  // 1e-48
-        {0xAAB8F01E6E10B4A6, 0xE9D71B689DDE71AF},  // 1e-47
-        {0xCAB3961304CA70E8, 0x9226712162AB070D},  // 1e-46
-        {0x3D607B97C5FD0D22, 0xB6B00D69BB55C8D1},  // 1e-45
-        {0x8CB89A7DB77C506A, 0xE45C10C42A2B3B05},  // 1e-44
-        {0x77F3608E92ADB242, 0x8EB98A7A9A5B04E3},  // 1e-43
-        {0x55F038B237591ED3, 0xB267ED1940F1C61C},  // 1e-42
-        {0x6B6C46DEC52F6688, 0xDF01E85F912E37A3},  // 1e-41
-        {0x2323AC4B3B3DA015, 0x8B61313BBABCE2C6},  // 1e-40
-        {0xABEC975E0A0D081A, 0xAE397D8AA96C1B77},  // 1e-39
-        {0x96E7BD358C904A21, 0xD9C7DCED53C72255},  // 1e-38
-        {0x7E50D64177DA2E54, 0x881CEA14545C7575},  // 1e-37
-        {0xDDE50BD1D5D0B9E9, 0xAA242499697392D2},  // 1e-36
-        {0x955E4EC64B44E864, 0xD4AD2DBFC3D07787},  // 1e-35
-        {0xBD5AF13BEF0B113E, 0x84EC3C97DA624AB4},  // 1e-34
-        {0xECB1AD8AEACDD58E, 0xA6274BBDD0FADD61},  // 1e-33
-        {0x67DE18EDA5814AF2, 0xCFB11EAD453994BA},  // 1e-32
-        {0x80EACF948770CED7, 0x81CEB32C4B43FCF4},  // 1e-31
-        {0xA1258379A94D028D, 0xA2425FF75E14FC31},  // 1e-30
-        {0x096EE45813A04330, 0xCAD2F7F5359A3B3E},  // 1e-29
-        {0x8BCA9D6E188853FC, 0xFD87B5F28300CA0D},  // 1e-28
-        {0x775EA264CF55347D, 0x9E74D1B791E07E48},  // 1e-27
-        {0x95364AFE032A819D, 0xC612062576589DDA},  // 1e-26
-        {0x3A83DDBD83F52204, 0xF79687AED3EEC551},  // 1e-25
-        {0xC4926A9672793542, 0x9ABE14CD44753B52},  // 1e-24
-        {0x75B7053C0F178293, 0xC16D9A0095928A27},  // 1e-23
-        {0x5324C68B12DD6338, 0xF1C90080BAF72CB1},  // 1e-22
-        {0xD3F6FC16EBCA5E03, 0x971DA05074DA7BEE},  // 1e-21
-        {0x88F4BB1CA6BCF584, 0xBCE5086492111AEA},  // 1e-20
-        {0x2B31E9E3D06C32E5, 0xEC1E4A7DB69561A5},  // 1e-19
-        {0x3AFF322E62439FCF, 0x9392EE8E921D5D07},  // 1e-18
-        {0x09BEFEB9FAD487C2, 0xB877AA3236A4B449},  // 1e-17
-        {0x4C2EBE687989A9B3, 0xE69594BEC44DE15B},  // 1e-16
-        {0x0F9D37014BF60A10, 0x901D7CF73AB0ACD9},  // 1e-15
-        {0x538484C19EF38C94, 0xB424DC35095CD80F},  // 1e-14
-        {0x2865A5F206B06FB9, 0xE12E13424BB40E13},  // 1e-13
-        {0xF93F87B7442E45D3, 0x8CBCCC096F5088CB},  // 1e-12
-        {0xF78F69A51539D748, 0xAFEBFF0BCB24AAFE},  // 1e-11
-        {0xB573440E5A884D1B, 0xDBE6FECEBDEDD5BE},  // 1e-10
-        {0x31680A88F8953030, 0x89705F4136B4A597},  // 1e-9
-        {0xFDC20D2B36BA7C3D, 0xABCC77118461CEFC},  // 1e-8
-        {0x3D32907604691B4C, 0xD6BF94D5E57A42BC},  // 1e-7
-        {0xA63F9A49C2C1B10F, 0x8637BD05AF6C69B5},  // 1e-6
-        {0x0FCF80DC33721D53, 0xA7C5AC471B478423},  // 1e-5
-        {0xD3C36113404EA4A8, 0xD1B71758E219652B},  // 1e-4
-        {0x645A1CAC083126E9, 0x83126E978D4FDF3B},  // 1e-3
-        {0x3D70A3D70A3D70A3, 0xA3D70A3D70A3D70A},  // 1e-2
-        {0xCCCCCCCCCCCCCCCC, 0xCCCCCCCCCCCCCCCC},  // 1e-1
-        {0x0000000000000000, 0x8000000000000000},  // 1e0
-        {0x0000000000000000, 0xA000000000000000},  // 1e1
-        {0x0000000000000000, 0xC800000000000000},  // 1e2
-        {0x0000000000000000, 0xFA00000000000000},  // 1e3
-        {0x0000000000000000, 0x9C40000000000000},  // 1e4
-        {0x0000000000000000, 0xC350000000000000},  // 1e5
-        {0x0000000000000000, 0xF424000000000000},  // 1e6
-        {0x0000000000000000, 0x9896800000000000},  // 1e7
-        {0x0000000000000000, 0xBEBC200000000000},  // 1e8
-        {0x0000000000000000, 0xEE6B280000000000},  // 1e9
-        {0x0000000000000000, 0x9502F90000000000},  // 1e10
-        {0x0000000000000000, 0xBA43B74000000000},  // 1e11
-        {0x0000000000000000, 0xE8D4A51000000000},  // 1e12
-        {0x0000000000000000, 0x9184E72A00000000},  // 1e13
-        {0x0000000000000000, 0xB5E620F480000000},  // 1e14
-        {0x0000000000000000, 0xE35FA931A0000000},  // 1e15
-        {0x0000000000000000, 0x8E1BC9BF04000000},  // 1e16
-        {0x0000000000000000, 0xB1A2BC2EC5000000},  // 1e17
-        {0x0000000000000000, 0xDE0B6B3A76400000},  // 1e18
-        {0x0000000000000000, 0x8AC7230489E80000},  // 1e19
-        {0x0000000000000000, 0xAD78EBC5AC620000},  // 1e20
-        {0x0000000000000000, 0xD8D726B7177A8000},  // 1e21
-        {0x0000000000000000, 0x878678326EAC9000},  // 1e22
-        {0x0000000000000000, 0xA968163F0A57B400},  // 1e23
-        {0x0000000000000000, 0xD3C21BCECCEDA100},  // 1e24
-        {0x0000000000000000, 0x84595161401484A0},  // 1e25
-        {0x0000000000000000, 0xA56FA5B99019A5C8},  // 1e26
-        {0x0000000000000000, 0xCECB8F27F4200F3A},  // 1e27
-        {0x4000000000000000, 0x813F3978F8940984},  // 1e28
-        {0x5000000000000000, 0xA18F07D736B90BE5},  // 1e29
-        {0xA400000000000000, 0xC9F2C9CD04674EDE},  // 1e30
-        {0x4D00000000000000, 0xFC6F7C4045812296},  // 1e31
-        {0xF020000000000000, 0x9DC5ADA82B70B59D},  // 1e32
-        {0x6C28000000000000, 0xC5371912364CE305},  // 1e33
-        {0xC732000000000000, 0xF684DF56C3E01BC6},  // 1e34
-        {0x3C7F400000000000, 0x9A130B963A6C115C},  // 1e35
-        {0x4B9F100000000000, 0xC097CE7BC90715B3},  // 1e36
-        {0x1E86D40000000000, 0xF0BDC21ABB48DB20},  // 1e37
-        {0x1314448000000000, 0x96769950B50D88F4},  // 1e38
-        {0x17D955A000000000, 0xBC143FA4E250EB31},  // 1e39
-        {0x5DCFAB0800000000, 0xEB194F8E1AE525FD},  // 1e40
-        {0x5AA1CAE500000000, 0x92EFD1B8D0CF37BE},  // 1e41
-        {0xF14A3D9E40000000, 0xB7ABC627050305AD},  // 1e42
-        {0x6D9CCD05D0000000, 0xE596B7B0C643C719},  // 1e43
-        {0xE4820023A2000000, 0x8F7E32CE7BEA5C6F},  // 1e44
-        {0xDDA2802C8A800000, 0xB35DBF821AE4F38B},  // 1e45
-        {0xD50B2037AD200000, 0xE0352F62A19E306E},  // 1e46
-        {0x4526F422CC340000, 0x8C213D9DA502DE45},  // 1e47
-        {0x9670B12B7F410000, 0xAF298D050E4395D6},  // 1e48
-        {0x3C0CDD765F114000, 0xDAF3F04651D47B4C},  // 1e49
-        {0xA5880A69FB6AC800, 0x88D8762BF324CD0F},  // 1e50
-        {0x8EEA0D047A457A00, 0xAB0E93B6EFEE0053},  // 1e51
-        {0x72A4904598D6D880, 0xD5D238A4ABE98068},  // 1e52
-        {0x47A6DA2B7F864750, 0x85A36366EB71F041},  // 1e53
-        {0x999090B65F67D924, 0xA70C3C40A64E6C51},  // 1e54
-        {0xFFF4B4E3F741CF6D, 0xD0CF4B50CFE20765},  // 1e55
-        {0xBFF8F10E7A8921A4, 0x82818F1281ED449F},  // 1e56
-        {0xAFF72D52192B6A0D, 0xA321F2D7226895C7},  // 1e57
-        {0x9BF4F8A69F764490, 0xCBEA6F8CEB02BB39},  // 1e58
-        {0x02F236D04753D5B4, 0xFEE50B7025C36A08},  // 1e59
-        {0x01D762422C946590, 0x9F4F2726179A2245},  // 1e60
-        {0x424D3AD2B7B97EF5, 0xC722F0EF9D80AAD6},  // 1e61
-        {0xD2E0898765A7DEB2, 0xF8EBAD2B84E0D58B},  // 1e62
-        {0x63CC55F49F88EB2F, 0x9B934C3B330C8577},  // 1e63
-        {0x3CBF6B71C76B25FB, 0xC2781F49FFCFA6D5},  // 1e64
-        {0x8BEF464E3945EF7A, 0xF316271C7FC3908A},  // 1e65
-        {0x97758BF0E3CBB5AC, 0x97EDD871CFDA3A56},  // 1e66
-        {0x3D52EEED1CBEA317, 0xBDE94E8E43D0C8EC},  // 1e67
-        {0x4CA7AAA863EE4BDD, 0xED63A231D4C4FB27},  // 1e68
-        {0x8FE8CAA93E74EF6A, 0x945E455F24FB1CF8},  // 1e69
-        {0xB3E2FD538E122B44, 0xB975D6B6EE39E436},  // 1e70
-        {0x60DBBCA87196B616, 0xE7D34C64A9C85D44},  // 1e71
-        {0xBC8955E946FE31CD, 0x90E40FBEEA1D3A4A},  // 1e72
-        {0x6BABAB6398BDBE41, 0xB51D13AEA4A488DD},  // 1e73
-        {0xC696963C7EED2DD1, 0xE264589A4DCDAB14},  // 1e74
-        {0xFC1E1DE5CF543CA2, 0x8D7EB76070A08AEC},  // 1e75
-        {0x3B25A55F43294BCB, 0xB0DE65388CC8ADA8},  // 1e76
-        {0x49EF0EB713F39EBE, 0xDD15FE86AFFAD912},  // 1e77
-        {0x6E3569326C784337, 0x8A2DBF142DFCC7AB},  // 1e78
-        {0x49C2C37F07965404, 0xACB92ED9397BF996},  // 1e79
-        {0xDC33745EC97BE906, 0xD7E77A8F87DAF7FB},  // 1e80
-        {0x69A028BB3DED71A3, 0x86F0AC99B4E8DAFD},  // 1e81
-        {0xC40832EA0D68CE0C, 0xA8ACD7C0222311BC},  // 1e82
-        {0xF50A3FA490C30190, 0xD2D80DB02AABD62B},  // 1e83
-        {0x792667C6DA79E0FA, 0x83C7088E1AAB65DB},  // 1e84
-        {0x577001B891185938, 0xA4B8CAB1A1563F52},  // 1e85
-        {0xED4C0226B55E6F86, 0xCDE6FD5E09ABCF26},  // 1e86
-        {0x544F8158315B05B4, 0x80B05E5AC60B6178},  // 1e87
-        {0x696361AE3DB1C721, 0xA0DC75F1778E39D6},  // 1e88
-        {0x03BC3A19CD1E38E9, 0xC913936DD571C84C},  // 1e89
-        {0x04AB48A04065C723, 0xFB5878494ACE3A5F},  // 1e90
-        {0x62EB0D64283F9C76, 0x9D174B2DCEC0E47B},  // 1e91
-        {0x3BA5D0BD324F8394, 0xC45D1DF942711D9A},  // 1e92
-        {0xCA8F44EC7EE36479, 0xF5746577930D6500},  // 1e93
-        {0x7E998B13CF4E1ECB, 0x9968BF6ABBE85F20},  // 1e94
-        {0x9E3FEDD8C321A67E, 0xBFC2EF456AE276E8},  // 1e95
-        {0xC5CFE94EF3EA101E, 0xEFB3AB16C59B14A2},  // 1e96
-        {0xBBA1F1D158724A12, 0x95D04AEE3B80ECE5},  // 1e97
-        {0x2A8A6E45AE8EDC97, 0xBB445DA9CA61281F},  // 1e98
-        {0xF52D09D71A3293BD, 0xEA1575143CF97226},  // 1e99
-        {0x593C2626705F9C56, 0x924D692CA61BE758},  // 1e100
-        {0x6F8B2FB00C77836C, 0xB6E0C377CFA2E12E},  // 1e101
-        {0x0B6DFB9C0F956447, 0xE498F455C38B997A},  // 1e102
-        {0x4724BD4189BD5EAC, 0x8EDF98B59A373FEC},  // 1e103
-        {0x58EDEC91EC2CB657, 0xB2977EE300C50FE7},  // 1e104
-        {0x2F2967B66737E3ED, 0xDF3D5E9BC0F653E1},  // 1e105
-        {0xBD79E0D20082EE74, 0x8B865B215899F46C},  // 1e106
-        {0xECD8590680A3AA11, 0xAE67F1E9AEC07187},  // 1e107
-        {0xE80E6F4820CC9495, 0xDA01EE641A708DE9},  // 1e108
-        {0x3109058D147FDCDD, 0x884134FE908658B2},  // 1e109
-        {0xBD4B46F0599FD415, 0xAA51823E34A7EEDE},  // 1e110
-        {0x6C9E18AC7007C91A, 0xD4E5E2CDC1D1EA96},  // 1e111
-        {0x03E2CF6BC604DDB0, 0x850FADC09923329E},  // 1e112
-        {0x84DB8346B786151C, 0xA6539930BF6BFF45},  // 1e113
-        {0xE612641865679A63, 0xCFE87F7CEF46FF16},  // 1e114
-        {0x4FCB7E8F3F60C07E, 0x81F14FAE158C5F6E},  // 1e115
-        {0xE3BE5E330F38F09D, 0xA26DA3999AEF7749},  // 1e116
-        {0x5CADF5BFD3072CC5, 0xCB090C8001AB551C},  // 1e117
-        {0x73D9732FC7C8F7F6, 0xFDCB4FA002162A63},  // 1e118
-        {0x2867E7FDDCDD9AFA, 0x9E9F11C4014DDA7E},  // 1e119
-        {0xB281E1FD541501B8, 0xC646D63501A1511D},  // 1e120
-        {0x1F225A7CA91A4226, 0xF7D88BC24209A565},  // 1e121
-        {0x3375788DE9B06958, 0x9AE757596946075F},  // 1e122
-        {0x0052D6B1641C83AE, 0xC1A12D2FC3978937},  // 1e123
-        {0xC0678C5DBD23A49A, 0xF209787BB47D6B84},  // 1e124
-        {0xF840B7BA963646E0, 0x9745EB4D50CE6332},  // 1e125
-        {0xB650E5A93BC3D898, 0xBD176620A501FBFF},  // 1e126
-        {0xA3E51F138AB4CEBE, 0xEC5D3FA8CE427AFF},  // 1e127
-        {0xC66F336C36B10137, 0x93BA47C980E98CDF},  // 1e128
-        {0xB80B0047445D4184, 0xB8A8D9BBE123F017},  // 1e129
-        {0xA60DC059157491E5, 0xE6D3102AD96CEC1D},  // 1e130
-        {0x87C89837AD68DB2F, 0x9043EA1AC7E41392},  // 1e131
-        {0x29BABE4598C311FB, 0xB454E4A179DD1877},  // 1e132
-        {0xF4296DD6FEF3D67A, 0xE16A1DC9D8545E94},  // 1e133
-        {0x1899E4A65F58660C, 0x8CE2529E2734BB1D},  // 1e134
-        {0x5EC05DCFF72E7F8F, 0xB01AE745B101E9E4},  // 1e135
-        {0x76707543F4FA1F73, 0xDC21A1171D42645D},  // 1e136
-        {0x6A06494A791C53A8, 0x899504AE72497EBA},  // 1e137
-        {0x0487DB9D17636892, 0xABFA45DA0EDBDE69},  // 1e138
-        {0x45A9D2845D3C42B6, 0xD6F8D7509292D603},  // 1e139
-        {0x0B8A2392BA45A9B2, 0x865B86925B9BC5C2},  // 1e140
-        {0x8E6CAC7768D7141E, 0xA7F26836F282B732},  // 1e141
-        {0x3207D795430CD926, 0xD1EF0244AF2364FF},  // 1e142
-        {0x7F44E6BD49E807B8, 0x8335616AED761F1F},  // 1e143
-        {0x5F16206C9C6209A6, 0xA402B9C5A8D3A6E7},  // 1e144
-        {0x36DBA887C37A8C0F, 0xCD036837130890A1},  // 1e145
-        {0xC2494954DA2C9789, 0x802221226BE55A64},  // 1e146
-        {0xF2DB9BAA10B7BD6C, 0xA02AA96B06DEB0FD},  // 1e147
-        {0x6F92829494E5ACC7, 0xC83553C5C8965D3D},  // 1e148
-        {0xCB772339BA1F17F9, 0xFA42A8B73ABBF48C},  // 1e149
-        {0xFF2A760414536EFB, 0x9C69A97284B578D7},  // 1e150
-        {0xFEF5138519684ABA, 0xC38413CF25E2D70D},  // 1e151
-        {0x7EB258665FC25D69, 0xF46518C2EF5B8CD1},  // 1e152
-        {0xEF2F773FFBD97A61, 0x98BF2F79D5993802},  // 1e153
-        {0xAAFB550FFACFD8FA, 0xBEEEFB584AFF8603},  // 1e154
-        {0x95BA2A53F983CF38, 0xEEAABA2E5DBF6784},  // 1e155
-        {0xDD945A747BF26183, 0x952AB45CFA97A0B2},  // 1e156
-        {0x94F971119AEEF9E4, 0xBA756174393D88DF},  // 1e157
-        {0x7A37CD5601AAB85D, 0xE912B9D1478CEB17},  // 1e158
-        {0xAC62E055C10AB33A, 0x91ABB422CCB812EE},  // 1e159
-        {0x577B986B314D6009, 0xB616A12B7FE617AA},  // 1e160
-        {0xED5A7E85FDA0B80B, 0xE39C49765FDF9D94},  // 1e161
-        {0x14588F13BE847307, 0x8E41ADE9FBEBC27D},  // 1e162
-        {0x596EB2D8AE258FC8, 0xB1D219647AE6B31C},  // 1e163
-        {0x6FCA5F8ED9AEF3BB, 0xDE469FBD99A05FE3},  // 1e164
-        {0x25DE7BB9480D5854, 0x8AEC23D680043BEE},  // 1e165
-        {0xAF561AA79A10AE6A, 0xADA72CCC20054AE9},  // 1e166
-        {0x1B2BA1518094DA04, 0xD910F7FF28069DA4},  // 1e167
-        {0x90FB44D2F05D0842, 0x87AA9AFF79042286},  // 1e168
-        {0x353A1607AC744A53, 0xA99541BF57452B28},  // 1e169
-        {0x42889B8997915CE8, 0xD3FA922F2D1675F2},  // 1e170
-        {0x69956135FEBADA11, 0x847C9B5D7C2E09B7},  // 1e171
-        {0x43FAB9837E699095, 0xA59BC234DB398C25},  // 1e172
-        {0x94F967E45E03F4BB, 0xCF02B2C21207EF2E},  // 1e173
-        {0x1D1BE0EEBAC278F5, 0x8161AFB94B44F57D},  // 1e174
-        {0x6462D92A69731732, 0xA1BA1BA79E1632DC},  // 1e175
-        {0x7D7B8F7503CFDCFE, 0xCA28A291859BBF93},  // 1e176
-        {0x5CDA735244C3D43E, 0xFCB2CB35E702AF78},  // 1e177
-        {0x3A0888136AFA64A7, 0x9DEFBF01B061ADAB},  // 1e178
-        {0x088AAA1845B8FDD0, 0xC56BAEC21C7A1916},  // 1e179
-        {0x8AAD549E57273D45, 0xF6C69A72A3989F5B},  // 1e180
-        {0x36AC54E2F678864B, 0x9A3C2087A63F6399},  // 1e181
-        {0x84576A1BB416A7DD, 0xC0CB28A98FCF3C7F},  // 1e182
-        {0x656D44A2A11C51D5, 0xF0FDF2D3F3C30B9F},  // 1e183
-        {0x9F644AE5A4B1B325, 0x969EB7C47859E743},  // 1e184
-        {0x873D5D9F0DDE1FEE, 0xBC4665B596706114},  // 1e185
-        {0xA90CB506D155A7EA, 0xEB57FF22FC0C7959},  // 1e186
-        {0x09A7F12442D588F2, 0x9316FF75DD87CBD8},  // 1e187
-        {0x0C11ED6D538AEB2F, 0xB7DCBF5354E9BECE},  // 1e188
-        {0x8F1668C8A86DA5FA, 0xE5D3EF282A242E81},  // 1e189
-        {0xF96E017D694487BC, 0x8FA475791A569D10},  // 1e190
-        {0x37C981DCC395A9AC, 0xB38D92D760EC4455},  // 1e191
-        {0x85BBE253F47B1417, 0xE070F78D3927556A},  // 1e192
-        {0x93956D7478CCEC8E, 0x8C469AB843B89562},  // 1e193
-        {0x387AC8D1970027B2, 0xAF58416654A6BABB},  // 1e194
-        {0x06997B05FCC0319E, 0xDB2E51BFE9D0696A},  // 1e195
-        {0x441FECE3BDF81F03, 0x88FCF317F22241E2},  // 1e196
-        {0xD527E81CAD7626C3, 0xAB3C2FDDEEAAD25A},  // 1e197
-        {0x8A71E223D8D3B074, 0xD60B3BD56A5586F1},  // 1e198
-        {0xF6872D5667844E49, 0x85C7056562757456},  // 1e199
-        {0xB428F8AC016561DB, 0xA738C6BEBB12D16C},  // 1e200
-        {0xE13336D701BEBA52, 0xD106F86E69D785C7},  // 1e201
-        {0xECC0024661173473, 0x82A45B450226B39C},  // 1e202
-        {0x27F002D7F95D0190, 0xA34D721642B06084},  // 1e203
-        {0x31EC038DF7B441F4, 0xCC20CE9BD35C78A5},  // 1e204
-        {0x7E67047175A15271, 0xFF290242C83396CE},  // 1e205
-        {0x0F0062C6E984D386, 0x9F79A169BD203E41},  // 1e206
-        {0x52C07B78A3E60868, 0xC75809C42C684DD1},  // 1e207
-        {0xA7709A56CCDF8A82, 0xF92E0C3537826145},  // 1e208
-        {0x88A66076400BB691, 0x9BBCC7A142B17CCB},  // 1e209
-        {0x6ACFF893D00EA435, 0xC2ABF989935DDBFE},  // 1e210
-        {0x0583F6B8C4124D43, 0xF356F7EBF83552FE},  // 1e211
-        {0xC3727A337A8B704A, 0x98165AF37B2153DE},  // 1e212
-        {0x744F18C0592E4C5C, 0xBE1BF1B059E9A8D6},  // 1e213
-        {0x1162DEF06F79DF73, 0xEDA2EE1C7064130C},  // 1e214
-        {0x8ADDCB5645AC2BA8, 0x9485D4D1C63E8BE7},  // 1e215
-        {0x6D953E2BD7173692, 0xB9A74A0637CE2EE1},  // 1e216
-        {0xC8FA8DB6CCDD0437, 0xE8111C87C5C1BA99},  // 1e217
-        {0x1D9C9892400A22A2, 0x910AB1D4DB9914A0},  // 1e218
-        {0x2503BEB6D00CAB4B, 0xB54D5E4A127F59C8},  // 1e219
-        {0x2E44AE64840FD61D, 0xE2A0B5DC971F303A},  // 1e220
-        {0x5CEAECFED289E5D2, 0x8DA471A9DE737E24},  // 1e221
-        {0x7425A83E872C5F47, 0xB10D8E1456105DAD},  // 1e222
-        {0xD12F124E28F77719, 0xDD50F1996B947518},  // 1e223
-        {0x82BD6B70D99AAA6F, 0x8A5296FFE33CC92F},  // 1e224
-        {0x636CC64D1001550B, 0xACE73CBFDC0BFB7B},  // 1e225
-        {0x3C47F7E05401AA4E, 0xD8210BEFD30EFA5A},  // 1e226
-        {0x65ACFAEC34810A71, 0x8714A775E3E95C78},  // 1e227
-        {0x7F1839A741A14D0D, 0xA8D9D1535CE3B396},  // 1e228
-        {0x1EDE48111209A050, 0xD31045A8341CA07C},  // 1e229
-        {0x934AED0AAB460432, 0x83EA2B892091E44D},  // 1e230
-        {0xF81DA84D5617853F, 0xA4E4B66B68B65D60},  // 1e231
-        {0x36251260AB9D668E, 0xCE1DE40642E3F4B9},  // 1e232
-        {0xC1D72B7C6B426019, 0x80D2AE83E9CE78F3},  // 1e233
-        {0xB24CF65B8612F81F, 0xA1075A24E4421730},  // 1e234
-        {0xDEE033F26797B627, 0xC94930AE1D529CFC},  // 1e235
-        {0x169840EF017DA3B1, 0xFB9B7CD9A4A7443C},  // 1e236
-        {0x8E1F289560EE864E, 0x9D412E0806E88AA5},  // 1e237
-        {0xF1A6F2BAB92A27E2, 0xC491798A08A2AD4E},  // 1e238
-        {0xAE10AF696774B1DB, 0xF5B5D7EC8ACB58A2},  // 1e239
-        {0xACCA6DA1E0A8EF29, 0x9991A6F3D6BF1765},  // 1e240
-        {0x17FD090A58D32AF3, 0xBFF610B0CC6EDD3F},  // 1e241
-        {0xDDFC4B4CEF07F5B0, 0xEFF394DCFF8A948E},  // 1e242
-        {0x4ABDAF101564F98E, 0x95F83D0A1FB69CD9},  // 1e243
-        {0x9D6D1AD41ABE37F1, 0xBB764C4CA7A4440F},  // 1e244
-        {0x84C86189216DC5ED, 0xEA53DF5FD18D5513},  // 1e245
-        {0x32FD3CF5B4E49BB4, 0x92746B9BE2F8552C},  // 1e246
-        {0x3FBC8C33221DC2A1, 0xB7118682DBB66A77},  // 1e247
-        {0x0FABAF3FEAA5334A, 0xE4D5E82392A40515},  // 1e248
-        {0x29CB4D87F2A7400E, 0x8F05B1163BA6832D},  // 1e249
-        {0x743E20E9EF511012, 0xB2C71D5BCA9023F8},  // 1e250
-        {0x914DA9246B255416, 0xDF78E4B2BD342CF6},  // 1e251
-        {0x1AD089B6C2F7548E, 0x8BAB8EEFB6409C1A},  // 1e252
-        {0xA184AC2473B529B1, 0xAE9672ABA3D0C320},  // 1e253
-        {0xC9E5D72D90A2741E, 0xDA3C0F568CC4F3E8},  // 1e254
-        {0x7E2FA67C7A658892, 0x8865899617FB1871},  // 1e255
-        {0xDDBB901B98FEEAB7, 0xAA7EEBFB9DF9DE8D},  // 1e256
-        {0x552A74227F3EA565, 0xD51EA6FA85785631},  // 1e257
-        {0xD53A88958F87275F, 0x8533285C936B35DE},  // 1e258
-        {0x8A892ABAF368F137, 0xA67FF273B8460356},  // 1e259
-        {0x2D2B7569B0432D85, 0xD01FEF10A657842C},  // 1e260
-        {0x9C3B29620E29FC73, 0x8213F56A67F6B29B},  // 1e261
-        {0x8349F3BA91B47B8F, 0xA298F2C501F45F42},  // 1e262
-        {0x241C70A936219A73, 0xCB3F2F7642717713},  // 1e263
-        {0xED238CD383AA0110, 0xFE0EFB53D30DD4D7},  // 1e264
-        {0xF4363804324A40AA, 0x9EC95D1463E8A506},  // 1e265
-        {0xB143C6053EDCD0D5, 0xC67BB4597CE2CE48},  // 1e266
-        {0xDD94B7868E94050A, 0xF81AA16FDC1B81DA},  // 1e267
-        {0xCA7CF2B4191C8326, 0x9B10A4E5E9913128},  // 1e268
-        {0xFD1C2F611F63A3F0, 0xC1D4CE1F63F57D72},  // 1e269
-        {0xBC633B39673C8CEC, 0xF24A01A73CF2DCCF},  // 1e270
-        {0xD5BE0503E085D813, 0x976E41088617CA01},  // 1e271
-        {0x4B2D8644D8A74E18, 0xBD49D14AA79DBC82},  // 1e272
-        {0xDDF8E7D60ED1219E, 0xEC9C459D51852BA2},  // 1e273
-        {0xCABB90E5C942B503, 0x93E1AB8252F33B45},  // 1e274
-        {0x3D6A751F3B936243, 0xB8DA1662E7B00A17},  // 1e275
-        {0x0CC512670A783AD4, 0xE7109BFBA19C0C9D},  // 1e276
-        {0x27FB2B80668B24C5, 0x906A617D450187E2},  // 1e277
-        {0xB1F9F660802DEDF6, 0xB484F9DC9641E9DA},  // 1e278
-        {0x5E7873F8A0396973, 0xE1A63853BBD26451},  // 1e279
-        {0xDB0B487B6423E1E8, 0x8D07E33455637EB2},  // 1e280
-        {0x91CE1A9A3D2CDA62, 0xB049DC016ABC5E5F},  // 1e281
-        {0x7641A140CC7810FB, 0xDC5C5301C56B75F7},  // 1e282
-        {0xA9E904C87FCB0A9D, 0x89B9B3E11B6329BA},  // 1e283
-        {0x546345FA9FBDCD44, 0xAC2820D9623BF429},  // 1e284
-        {0xA97C177947AD4095, 0xD732290FBACAF133},  // 1e285
-        {0x49ED8EABCCCC485D, 0x867F59A9D4BED6C0},  // 1e286
-        {0x5C68F256BFFF5A74, 0xA81F301449EE8C70},  // 1e287
-        {0x73832EEC6FFF3111, 0xD226FC195C6A2F8C},  // 1e288
+static const uint64_t wuffs_private_impl__powers_of_10[596][2] = {
+    {0xA5D3B6D479F8E056, 0x8FD0C16206306BAB},  // 1e-307
+    {0x8F48A4899877186C, 0xB3C4F1BA87BC8696},  // 1e-306
+    {0x331ACDABFE94DE87, 0xE0B62E2929ABA83C},  // 1e-305
+    {0x9FF0C08B7F1D0B14, 0x8C71DCD9BA0B4925},  // 1e-304
+    {0x07ECF0AE5EE44DD9, 0xAF8E5410288E1B6F},  // 1e-303
+    {0xC9E82CD9F69D6150, 0xDB71E91432B1A24A},  // 1e-302
+    {0xBE311C083A225CD2, 0x892731AC9FAF056E},  // 1e-301
+    {0x6DBD630A48AAF406, 0xAB70FE17C79AC6CA},  // 1e-300
+    {0x092CBBCCDAD5B108, 0xD64D3D9DB981787D},  // 1e-299
+    {0x25BBF56008C58EA5, 0x85F0468293F0EB4E},  // 1e-298
+    {0xAF2AF2B80AF6F24E, 0xA76C582338ED2621},  // 1e-297
+    {0x1AF5AF660DB4AEE1, 0xD1476E2C07286FAA},  // 1e-296
+    {0x50D98D9FC890ED4D, 0x82CCA4DB847945CA},  // 1e-295
+    {0xE50FF107BAB528A0, 0xA37FCE126597973C},  // 1e-294
+    {0x1E53ED49A96272C8, 0xCC5FC196FEFD7D0C},  // 1e-293
+    {0x25E8E89C13BB0F7A, 0xFF77B1FCBEBCDC4F},  // 1e-292
+    {0x77B191618C54E9AC, 0x9FAACF3DF73609B1},  // 1e-291
+    {0xD59DF5B9EF6A2417, 0xC795830D75038C1D},  // 1e-290
+    {0x4B0573286B44AD1D, 0xF97AE3D0D2446F25},  // 1e-289
+    {0x4EE367F9430AEC32, 0x9BECCE62836AC577},  // 1e-288
+    {0x229C41F793CDA73F, 0xC2E801FB244576D5},  // 1e-287
+    {0x6B43527578C1110F, 0xF3A20279ED56D48A},  // 1e-286
+    {0x830A13896B78AAA9, 0x9845418C345644D6},  // 1e-285
+    {0x23CC986BC656D553, 0xBE5691EF416BD60C},  // 1e-284
+    {0x2CBFBE86B7EC8AA8, 0xEDEC366B11C6CB8F},  // 1e-283
+    {0x7BF7D71432F3D6A9, 0x94B3A202EB1C3F39},  // 1e-282
+    {0xDAF5CCD93FB0CC53, 0xB9E08A83A5E34F07},  // 1e-281
+    {0xD1B3400F8F9CFF68, 0xE858AD248F5C22C9},  // 1e-280
+    {0x23100809B9C21FA1, 0x91376C36D99995BE},  // 1e-279
+    {0xABD40A0C2832A78A, 0xB58547448FFFFB2D},  // 1e-278
+    {0x16C90C8F323F516C, 0xE2E69915B3FFF9F9},  // 1e-277
+    {0xAE3DA7D97F6792E3, 0x8DD01FAD907FFC3B},  // 1e-276
+    {0x99CD11CFDF41779C, 0xB1442798F49FFB4A},  // 1e-275
+    {0x40405643D711D583, 0xDD95317F31C7FA1D},  // 1e-274
+    {0x482835EA666B2572, 0x8A7D3EEF7F1CFC52},  // 1e-273
+    {0xDA3243650005EECF, 0xAD1C8EAB5EE43B66},  // 1e-272
+    {0x90BED43E40076A82, 0xD863B256369D4A40},  // 1e-271
+    {0x5A7744A6E804A291, 0x873E4F75E2224E68},  // 1e-270
+    {0x711515D0A205CB36, 0xA90DE3535AAAE202},  // 1e-269
+    {0x0D5A5B44CA873E03, 0xD3515C2831559A83},  // 1e-268
+    {0xE858790AFE9486C2, 0x8412D9991ED58091},  // 1e-267
+    {0x626E974DBE39A872, 0xA5178FFF668AE0B6},  // 1e-266
+    {0xFB0A3D212DC8128F, 0xCE5D73FF402D98E3},  // 1e-265
+    {0x7CE66634BC9D0B99, 0x80FA687F881C7F8E},  // 1e-264
+    {0x1C1FFFC1EBC44E80, 0xA139029F6A239F72},  // 1e-263
+    {0xA327FFB266B56220, 0xC987434744AC874E},  // 1e-262
+    {0x4BF1FF9F0062BAA8, 0xFBE9141915D7A922},  // 1e-261
+    {0x6F773FC3603DB4A9, 0x9D71AC8FADA6C9B5},  // 1e-260
+    {0xCB550FB4384D21D3, 0xC4CE17B399107C22},  // 1e-259
+    {0x7E2A53A146606A48, 0xF6019DA07F549B2B},  // 1e-258
+    {0x2EDA7444CBFC426D, 0x99C102844F94E0FB},  // 1e-257
+    {0xFA911155FEFB5308, 0xC0314325637A1939},  // 1e-256
+    {0x793555AB7EBA27CA, 0xF03D93EEBC589F88},  // 1e-255
+    {0x4BC1558B2F3458DE, 0x96267C7535B763B5},  // 1e-254
+    {0x9EB1AAEDFB016F16, 0xBBB01B9283253CA2},  // 1e-253
+    {0x465E15A979C1CADC, 0xEA9C227723EE8BCB},  // 1e-252
+    {0x0BFACD89EC191EC9, 0x92A1958A7675175F},  // 1e-251
+    {0xCEF980EC671F667B, 0xB749FAED14125D36},  // 1e-250
+    {0x82B7E12780E7401A, 0xE51C79A85916F484},  // 1e-249
+    {0xD1B2ECB8B0908810, 0x8F31CC0937AE58D2},  // 1e-248
+    {0x861FA7E6DCB4AA15, 0xB2FE3F0B8599EF07},  // 1e-247
+    {0x67A791E093E1D49A, 0xDFBDCECE67006AC9},  // 1e-246
+    {0xE0C8BB2C5C6D24E0, 0x8BD6A141006042BD},  // 1e-245
+    {0x58FAE9F773886E18, 0xAECC49914078536D},  // 1e-244
+    {0xAF39A475506A899E, 0xDA7F5BF590966848},  // 1e-243
+    {0x6D8406C952429603, 0x888F99797A5E012D},  // 1e-242
+    {0xC8E5087BA6D33B83, 0xAAB37FD7D8F58178},  // 1e-241
+    {0xFB1E4A9A90880A64, 0xD5605FCDCF32E1D6},  // 1e-240
+    {0x5CF2EEA09A55067F, 0x855C3BE0A17FCD26},  // 1e-239
+    {0xF42FAA48C0EA481E, 0xA6B34AD8C9DFC06F},  // 1e-238
+    {0xF13B94DAF124DA26, 0xD0601D8EFC57B08B},  // 1e-237
+    {0x76C53D08D6B70858, 0x823C12795DB6CE57},  // 1e-236
+    {0x54768C4B0C64CA6E, 0xA2CB1717B52481ED},  // 1e-235
+    {0xA9942F5DCF7DFD09, 0xCB7DDCDDA26DA268},  // 1e-234
+    {0xD3F93B35435D7C4C, 0xFE5D54150B090B02},  // 1e-233
+    {0xC47BC5014A1A6DAF, 0x9EFA548D26E5A6E1},  // 1e-232
+    {0x359AB6419CA1091B, 0xC6B8E9B0709F109A},  // 1e-231
+    {0xC30163D203C94B62, 0xF867241C8CC6D4C0},  // 1e-230
+    {0x79E0DE63425DCF1D, 0x9B407691D7FC44F8},  // 1e-229
+    {0x985915FC12F542E4, 0xC21094364DFB5636},  // 1e-228
+    {0x3E6F5B7B17B2939D, 0xF294B943E17A2BC4},  // 1e-227
+    {0xA705992CEECF9C42, 0x979CF3CA6CEC5B5A},  // 1e-226
+    {0x50C6FF782A838353, 0xBD8430BD08277231},  // 1e-225
+    {0xA4F8BF5635246428, 0xECE53CEC4A314EBD},  // 1e-224
+    {0x871B7795E136BE99, 0x940F4613AE5ED136},  // 1e-223
+    {0x28E2557B59846E3F, 0xB913179899F68584},  // 1e-222
+    {0x331AEADA2FE589CF, 0xE757DD7EC07426E5},  // 1e-221
+    {0x3FF0D2C85DEF7621, 0x9096EA6F3848984F},  // 1e-220
+    {0x0FED077A756B53A9, 0xB4BCA50B065ABE63},  // 1e-219
+    {0xD3E8495912C62894, 0xE1EBCE4DC7F16DFB},  // 1e-218
+    {0x64712DD7ABBBD95C, 0x8D3360F09CF6E4BD},  // 1e-217
+    {0xBD8D794D96AACFB3, 0xB080392CC4349DEC},  // 1e-216
+    {0xECF0D7A0FC5583A0, 0xDCA04777F541C567},  // 1e-215
+    {0xF41686C49DB57244, 0x89E42CAAF9491B60},  // 1e-214
+    {0x311C2875C522CED5, 0xAC5D37D5B79B6239},  // 1e-213
+    {0x7D633293366B828B, 0xD77485CB25823AC7},  // 1e-212
+    {0xAE5DFF9C02033197, 0x86A8D39EF77164BC},  // 1e-211
+    {0xD9F57F830283FDFC, 0xA8530886B54DBDEB},  // 1e-210
+    {0xD072DF63C324FD7B, 0xD267CAA862A12D66},  // 1e-209
+    {0x4247CB9E59F71E6D, 0x8380DEA93DA4BC60},  // 1e-208
+    {0x52D9BE85F074E608, 0xA46116538D0DEB78},  // 1e-207
+    {0x67902E276C921F8B, 0xCD795BE870516656},  // 1e-206
+    {0x00BA1CD8A3DB53B6, 0x806BD9714632DFF6},  // 1e-205
+    {0x80E8A40ECCD228A4, 0xA086CFCD97BF97F3},  // 1e-204
+    {0x6122CD128006B2CD, 0xC8A883C0FDAF7DF0},  // 1e-203
+    {0x796B805720085F81, 0xFAD2A4B13D1B5D6C},  // 1e-202
+    {0xCBE3303674053BB0, 0x9CC3A6EEC6311A63},  // 1e-201
+    {0xBEDBFC4411068A9C, 0xC3F490AA77BD60FC},  // 1e-200
+    {0xEE92FB5515482D44, 0xF4F1B4D515ACB93B},  // 1e-199
+    {0x751BDD152D4D1C4A, 0x991711052D8BF3C5},  // 1e-198
+    {0xD262D45A78A0635D, 0xBF5CD54678EEF0B6},  // 1e-197
+    {0x86FB897116C87C34, 0xEF340A98172AACE4},  // 1e-196
+    {0xD45D35E6AE3D4DA0, 0x9580869F0E7AAC0E},  // 1e-195
+    {0x8974836059CCA109, 0xBAE0A846D2195712},  // 1e-194
+    {0x2BD1A438703FC94B, 0xE998D258869FACD7},  // 1e-193
+    {0x7B6306A34627DDCF, 0x91FF83775423CC06},  // 1e-192
+    {0x1A3BC84C17B1D542, 0xB67F6455292CBF08},  // 1e-191
+    {0x20CABA5F1D9E4A93, 0xE41F3D6A7377EECA},  // 1e-190
+    {0x547EB47B7282EE9C, 0x8E938662882AF53E},  // 1e-189
+    {0xE99E619A4F23AA43, 0xB23867FB2A35B28D},  // 1e-188
+    {0x6405FA00E2EC94D4, 0xDEC681F9F4C31F31},  // 1e-187
+    {0xDE83BC408DD3DD04, 0x8B3C113C38F9F37E},  // 1e-186
+    {0x9624AB50B148D445, 0xAE0B158B4738705E},  // 1e-185
+    {0x3BADD624DD9B0957, 0xD98DDAEE19068C76},  // 1e-184
+    {0xE54CA5D70A80E5D6, 0x87F8A8D4CFA417C9},  // 1e-183
+    {0x5E9FCF4CCD211F4C, 0xA9F6D30A038D1DBC},  // 1e-182
+    {0x7647C3200069671F, 0xD47487CC8470652B},  // 1e-181
+    {0x29ECD9F40041E073, 0x84C8D4DFD2C63F3B},  // 1e-180
+    {0xF468107100525890, 0xA5FB0A17C777CF09},  // 1e-179
+    {0x7182148D4066EEB4, 0xCF79CC9DB955C2CC},  // 1e-178
+    {0xC6F14CD848405530, 0x81AC1FE293D599BF},  // 1e-177
+    {0xB8ADA00E5A506A7C, 0xA21727DB38CB002F},  // 1e-176
+    {0xA6D90811F0E4851C, 0xCA9CF1D206FDC03B},  // 1e-175
+    {0x908F4A166D1DA663, 0xFD442E4688BD304A},  // 1e-174
+    {0x9A598E4E043287FE, 0x9E4A9CEC15763E2E},  // 1e-173
+    {0x40EFF1E1853F29FD, 0xC5DD44271AD3CDBA},  // 1e-172
+    {0xD12BEE59E68EF47C, 0xF7549530E188C128},  // 1e-171
+    {0x82BB74F8301958CE, 0x9A94DD3E8CF578B9},  // 1e-170
+    {0xE36A52363C1FAF01, 0xC13A148E3032D6E7},  // 1e-169
+    {0xDC44E6C3CB279AC1, 0xF18899B1BC3F8CA1},  // 1e-168
+    {0x29AB103A5EF8C0B9, 0x96F5600F15A7B7E5},  // 1e-167
+    {0x7415D448F6B6F0E7, 0xBCB2B812DB11A5DE},  // 1e-166
+    {0x111B495B3464AD21, 0xEBDF661791D60F56},  // 1e-165
+    {0xCAB10DD900BEEC34, 0x936B9FCEBB25C995},  // 1e-164
+    {0x3D5D514F40EEA742, 0xB84687C269EF3BFB},  // 1e-163
+    {0x0CB4A5A3112A5112, 0xE65829B3046B0AFA},  // 1e-162
+    {0x47F0E785EABA72AB, 0x8FF71A0FE2C2E6DC},  // 1e-161
+    {0x59ED216765690F56, 0xB3F4E093DB73A093},  // 1e-160
+    {0x306869C13EC3532C, 0xE0F218B8D25088B8},  // 1e-159
+    {0x1E414218C73A13FB, 0x8C974F7383725573},  // 1e-158
+    {0xE5D1929EF90898FA, 0xAFBD2350644EEACF},  // 1e-157
+    {0xDF45F746B74ABF39, 0xDBAC6C247D62A583},  // 1e-156
+    {0x6B8BBA8C328EB783, 0x894BC396CE5DA772},  // 1e-155
+    {0x066EA92F3F326564, 0xAB9EB47C81F5114F},  // 1e-154
+    {0xC80A537B0EFEFEBD, 0xD686619BA27255A2},  // 1e-153
+    {0xBD06742CE95F5F36, 0x8613FD0145877585},  // 1e-152
+    {0x2C48113823B73704, 0xA798FC4196E952E7},  // 1e-151
+    {0xF75A15862CA504C5, 0xD17F3B51FCA3A7A0},  // 1e-150
+    {0x9A984D73DBE722FB, 0x82EF85133DE648C4},  // 1e-149
+    {0xC13E60D0D2E0EBBA, 0xA3AB66580D5FDAF5},  // 1e-148
+    {0x318DF905079926A8, 0xCC963FEE10B7D1B3},  // 1e-147
+    {0xFDF17746497F7052, 0xFFBBCFE994E5C61F},  // 1e-146
+    {0xFEB6EA8BEDEFA633, 0x9FD561F1FD0F9BD3},  // 1e-145
+    {0xFE64A52EE96B8FC0, 0xC7CABA6E7C5382C8},  // 1e-144
+    {0x3DFDCE7AA3C673B0, 0xF9BD690A1B68637B},  // 1e-143
+    {0x06BEA10CA65C084E, 0x9C1661A651213E2D},  // 1e-142
+    {0x486E494FCFF30A62, 0xC31BFA0FE5698DB8},  // 1e-141
+    {0x5A89DBA3C3EFCCFA, 0xF3E2F893DEC3F126},  // 1e-140
+    {0xF89629465A75E01C, 0x986DDB5C6B3A76B7},  // 1e-139
+    {0xF6BBB397F1135823, 0xBE89523386091465},  // 1e-138
+    {0x746AA07DED582E2C, 0xEE2BA6C0678B597F},  // 1e-137
+    {0xA8C2A44EB4571CDC, 0x94DB483840B717EF},  // 1e-136
+    {0x92F34D62616CE413, 0xBA121A4650E4DDEB},  // 1e-135
+    {0x77B020BAF9C81D17, 0xE896A0D7E51E1566},  // 1e-134
+    {0x0ACE1474DC1D122E, 0x915E2486EF32CD60},  // 1e-133
+    {0x0D819992132456BA, 0xB5B5ADA8AAFF80B8},  // 1e-132
+    {0x10E1FFF697ED6C69, 0xE3231912D5BF60E6},  // 1e-131
+    {0xCA8D3FFA1EF463C1, 0x8DF5EFABC5979C8F},  // 1e-130
+    {0xBD308FF8A6B17CB2, 0xB1736B96B6FD83B3},  // 1e-129
+    {0xAC7CB3F6D05DDBDE, 0xDDD0467C64BCE4A0},  // 1e-128
+    {0x6BCDF07A423AA96B, 0x8AA22C0DBEF60EE4},  // 1e-127
+    {0x86C16C98D2C953C6, 0xAD4AB7112EB3929D},  // 1e-126
+    {0xE871C7BF077BA8B7, 0xD89D64D57A607744},  // 1e-125
+    {0x11471CD764AD4972, 0x87625F056C7C4A8B},  // 1e-124
+    {0xD598E40D3DD89BCF, 0xA93AF6C6C79B5D2D},  // 1e-123
+    {0x4AFF1D108D4EC2C3, 0xD389B47879823479},  // 1e-122
+    {0xCEDF722A585139BA, 0x843610CB4BF160CB},  // 1e-121
+    {0xC2974EB4EE658828, 0xA54394FE1EEDB8FE},  // 1e-120
+    {0x733D226229FEEA32, 0xCE947A3DA6A9273E},  // 1e-119
+    {0x0806357D5A3F525F, 0x811CCC668829B887},  // 1e-118
+    {0xCA07C2DCB0CF26F7, 0xA163FF802A3426A8},  // 1e-117
+    {0xFC89B393DD02F0B5, 0xC9BCFF6034C13052},  // 1e-116
+    {0xBBAC2078D443ACE2, 0xFC2C3F3841F17C67},  // 1e-115
+    {0xD54B944B84AA4C0D, 0x9D9BA7832936EDC0},  // 1e-114
+    {0x0A9E795E65D4DF11, 0xC5029163F384A931},  // 1e-113
+    {0x4D4617B5FF4A16D5, 0xF64335BCF065D37D},  // 1e-112
+    {0x504BCED1BF8E4E45, 0x99EA0196163FA42E},  // 1e-111
+    {0xE45EC2862F71E1D6, 0xC06481FB9BCF8D39},  // 1e-110
+    {0x5D767327BB4E5A4C, 0xF07DA27A82C37088},  // 1e-109
+    {0x3A6A07F8D510F86F, 0x964E858C91BA2655},  // 1e-108
+    {0x890489F70A55368B, 0xBBE226EFB628AFEA},  // 1e-107
+    {0x2B45AC74CCEA842E, 0xEADAB0ABA3B2DBE5},  // 1e-106
+    {0x3B0B8BC90012929D, 0x92C8AE6B464FC96F},  // 1e-105
+    {0x09CE6EBB40173744, 0xB77ADA0617E3BBCB},  // 1e-104
+    {0xCC420A6A101D0515, 0xE55990879DDCAABD},  // 1e-103
+    {0x9FA946824A12232D, 0x8F57FA54C2A9EAB6},  // 1e-102
+    {0x47939822DC96ABF9, 0xB32DF8E9F3546564},  // 1e-101
+    {0x59787E2B93BC56F7, 0xDFF9772470297EBD},  // 1e-100
+    {0x57EB4EDB3C55B65A, 0x8BFBEA76C619EF36},  // 1e-99
+    {0xEDE622920B6B23F1, 0xAEFAE51477A06B03},  // 1e-98
+    {0xE95FAB368E45ECED, 0xDAB99E59958885C4},  // 1e-97
+    {0x11DBCB0218EBB414, 0x88B402F7FD75539B},  // 1e-96
+    {0xD652BDC29F26A119, 0xAAE103B5FCD2A881},  // 1e-95
+    {0x4BE76D3346F0495F, 0xD59944A37C0752A2},  // 1e-94
+    {0x6F70A4400C562DDB, 0x857FCAE62D8493A5},  // 1e-93
+    {0xCB4CCD500F6BB952, 0xA6DFBD9FB8E5B88E},  // 1e-92
+    {0x7E2000A41346A7A7, 0xD097AD07A71F26B2},  // 1e-91
+    {0x8ED400668C0C28C8, 0x825ECC24C873782F},  // 1e-90
+    {0x728900802F0F32FA, 0xA2F67F2DFA90563B},  // 1e-89
+    {0x4F2B40A03AD2FFB9, 0xCBB41EF979346BCA},  // 1e-88
+    {0xE2F610C84987BFA8, 0xFEA126B7D78186BC},  // 1e-87
+    {0x0DD9CA7D2DF4D7C9, 0x9F24B832E6B0F436},  // 1e-86
+    {0x91503D1C79720DBB, 0xC6EDE63FA05D3143},  // 1e-85
+    {0x75A44C6397CE912A, 0xF8A95FCF88747D94},  // 1e-84
+    {0xC986AFBE3EE11ABA, 0x9B69DBE1B548CE7C},  // 1e-83
+    {0xFBE85BADCE996168, 0xC24452DA229B021B},  // 1e-82
+    {0xFAE27299423FB9C3, 0xF2D56790AB41C2A2},  // 1e-81
+    {0xDCCD879FC967D41A, 0x97C560BA6B0919A5},  // 1e-80
+    {0x5400E987BBC1C920, 0xBDB6B8E905CB600F},  // 1e-79
+    {0x290123E9AAB23B68, 0xED246723473E3813},  // 1e-78
+    {0xF9A0B6720AAF6521, 0x9436C0760C86E30B},  // 1e-77
+    {0xF808E40E8D5B3E69, 0xB94470938FA89BCE},  // 1e-76
+    {0xB60B1D1230B20E04, 0xE7958CB87392C2C2},  // 1e-75
+    {0xB1C6F22B5E6F48C2, 0x90BD77F3483BB9B9},  // 1e-74
+    {0x1E38AEB6360B1AF3, 0xB4ECD5F01A4AA828},  // 1e-73
+    {0x25C6DA63C38DE1B0, 0xE2280B6C20DD5232},  // 1e-72
+    {0x579C487E5A38AD0E, 0x8D590723948A535F},  // 1e-71
+    {0x2D835A9DF0C6D851, 0xB0AF48EC79ACE837},  // 1e-70
+    {0xF8E431456CF88E65, 0xDCDB1B2798182244},  // 1e-69
+    {0x1B8E9ECB641B58FF, 0x8A08F0F8BF0F156B},  // 1e-68
+    {0xE272467E3D222F3F, 0xAC8B2D36EED2DAC5},  // 1e-67
+    {0x5B0ED81DCC6ABB0F, 0xD7ADF884AA879177},  // 1e-66
+    {0x98E947129FC2B4E9, 0x86CCBB52EA94BAEA},  // 1e-65
+    {0x3F2398D747B36224, 0xA87FEA27A539E9A5},  // 1e-64
+    {0x8EEC7F0D19A03AAD, 0xD29FE4B18E88640E},  // 1e-63
+    {0x1953CF68300424AC, 0x83A3EEEEF9153E89},  // 1e-62
+    {0x5FA8C3423C052DD7, 0xA48CEAAAB75A8E2B},  // 1e-61
+    {0x3792F412CB06794D, 0xCDB02555653131B6},  // 1e-60
+    {0xE2BBD88BBEE40BD0, 0x808E17555F3EBF11},  // 1e-59
+    {0x5B6ACEAEAE9D0EC4, 0xA0B19D2AB70E6ED6},  // 1e-58
+    {0xF245825A5A445275, 0xC8DE047564D20A8B},  // 1e-57
+    {0xEED6E2F0F0D56712, 0xFB158592BE068D2E},  // 1e-56
+    {0x55464DD69685606B, 0x9CED737BB6C4183D},  // 1e-55
+    {0xAA97E14C3C26B886, 0xC428D05AA4751E4C},  // 1e-54
+    {0xD53DD99F4B3066A8, 0xF53304714D9265DF},  // 1e-53
+    {0xE546A8038EFE4029, 0x993FE2C6D07B7FAB},  // 1e-52
+    {0xDE98520472BDD033, 0xBF8FDB78849A5F96},  // 1e-51
+    {0x963E66858F6D4440, 0xEF73D256A5C0F77C},  // 1e-50
+    {0xDDE7001379A44AA8, 0x95A8637627989AAD},  // 1e-49
+    {0x5560C018580D5D52, 0xBB127C53B17EC159},  // 1e-48
+    {0xAAB8F01E6E10B4A6, 0xE9D71B689DDE71AF},  // 1e-47
+    {0xCAB3961304CA70E8, 0x9226712162AB070D},  // 1e-46
+    {0x3D607B97C5FD0D22, 0xB6B00D69BB55C8D1},  // 1e-45
+    {0x8CB89A7DB77C506A, 0xE45C10C42A2B3B05},  // 1e-44
+    {0x77F3608E92ADB242, 0x8EB98A7A9A5B04E3},  // 1e-43
+    {0x55F038B237591ED3, 0xB267ED1940F1C61C},  // 1e-42
+    {0x6B6C46DEC52F6688, 0xDF01E85F912E37A3},  // 1e-41
+    {0x2323AC4B3B3DA015, 0x8B61313BBABCE2C6},  // 1e-40
+    {0xABEC975E0A0D081A, 0xAE397D8AA96C1B77},  // 1e-39
+    {0x96E7BD358C904A21, 0xD9C7DCED53C72255},  // 1e-38
+    {0x7E50D64177DA2E54, 0x881CEA14545C7575},  // 1e-37
+    {0xDDE50BD1D5D0B9E9, 0xAA242499697392D2},  // 1e-36
+    {0x955E4EC64B44E864, 0xD4AD2DBFC3D07787},  // 1e-35
+    {0xBD5AF13BEF0B113E, 0x84EC3C97DA624AB4},  // 1e-34
+    {0xECB1AD8AEACDD58E, 0xA6274BBDD0FADD61},  // 1e-33
+    {0x67DE18EDA5814AF2, 0xCFB11EAD453994BA},  // 1e-32
+    {0x80EACF948770CED7, 0x81CEB32C4B43FCF4},  // 1e-31
+    {0xA1258379A94D028D, 0xA2425FF75E14FC31},  // 1e-30
+    {0x096EE45813A04330, 0xCAD2F7F5359A3B3E},  // 1e-29
+    {0x8BCA9D6E188853FC, 0xFD87B5F28300CA0D},  // 1e-28
+    {0x775EA264CF55347D, 0x9E74D1B791E07E48},  // 1e-27
+    {0x95364AFE032A819D, 0xC612062576589DDA},  // 1e-26
+    {0x3A83DDBD83F52204, 0xF79687AED3EEC551},  // 1e-25
+    {0xC4926A9672793542, 0x9ABE14CD44753B52},  // 1e-24
+    {0x75B7053C0F178293, 0xC16D9A0095928A27},  // 1e-23
+    {0x5324C68B12DD6338, 0xF1C90080BAF72CB1},  // 1e-22
+    {0xD3F6FC16EBCA5E03, 0x971DA05074DA7BEE},  // 1e-21
+    {0x88F4BB1CA6BCF584, 0xBCE5086492111AEA},  // 1e-20
+    {0x2B31E9E3D06C32E5, 0xEC1E4A7DB69561A5},  // 1e-19
+    {0x3AFF322E62439FCF, 0x9392EE8E921D5D07},  // 1e-18
+    {0x09BEFEB9FAD487C2, 0xB877AA3236A4B449},  // 1e-17
+    {0x4C2EBE687989A9B3, 0xE69594BEC44DE15B},  // 1e-16
+    {0x0F9D37014BF60A10, 0x901D7CF73AB0ACD9},  // 1e-15
+    {0x538484C19EF38C94, 0xB424DC35095CD80F},  // 1e-14
+    {0x2865A5F206B06FB9, 0xE12E13424BB40E13},  // 1e-13
+    {0xF93F87B7442E45D3, 0x8CBCCC096F5088CB},  // 1e-12
+    {0xF78F69A51539D748, 0xAFEBFF0BCB24AAFE},  // 1e-11
+    {0xB573440E5A884D1B, 0xDBE6FECEBDEDD5BE},  // 1e-10
+    {0x31680A88F8953030, 0x89705F4136B4A597},  // 1e-9
+    {0xFDC20D2B36BA7C3D, 0xABCC77118461CEFC},  // 1e-8
+    {0x3D32907604691B4C, 0xD6BF94D5E57A42BC},  // 1e-7
+    {0xA63F9A49C2C1B10F, 0x8637BD05AF6C69B5},  // 1e-6
+    {0x0FCF80DC33721D53, 0xA7C5AC471B478423},  // 1e-5
+    {0xD3C36113404EA4A8, 0xD1B71758E219652B},  // 1e-4
+    {0x645A1CAC083126E9, 0x83126E978D4FDF3B},  // 1e-3
+    {0x3D70A3D70A3D70A3, 0xA3D70A3D70A3D70A},  // 1e-2
+    {0xCCCCCCCCCCCCCCCC, 0xCCCCCCCCCCCCCCCC},  // 1e-1
+    {0x0000000000000000, 0x8000000000000000},  // 1e0
+    {0x0000000000000000, 0xA000000000000000},  // 1e1
+    {0x0000000000000000, 0xC800000000000000},  // 1e2
+    {0x0000000000000000, 0xFA00000000000000},  // 1e3
+    {0x0000000000000000, 0x9C40000000000000},  // 1e4
+    {0x0000000000000000, 0xC350000000000000},  // 1e5
+    {0x0000000000000000, 0xF424000000000000},  // 1e6
+    {0x0000000000000000, 0x9896800000000000},  // 1e7
+    {0x0000000000000000, 0xBEBC200000000000},  // 1e8
+    {0x0000000000000000, 0xEE6B280000000000},  // 1e9
+    {0x0000000000000000, 0x9502F90000000000},  // 1e10
+    {0x0000000000000000, 0xBA43B74000000000},  // 1e11
+    {0x0000000000000000, 0xE8D4A51000000000},  // 1e12
+    {0x0000000000000000, 0x9184E72A00000000},  // 1e13
+    {0x0000000000000000, 0xB5E620F480000000},  // 1e14
+    {0x0000000000000000, 0xE35FA931A0000000},  // 1e15
+    {0x0000000000000000, 0x8E1BC9BF04000000},  // 1e16
+    {0x0000000000000000, 0xB1A2BC2EC5000000},  // 1e17
+    {0x0000000000000000, 0xDE0B6B3A76400000},  // 1e18
+    {0x0000000000000000, 0x8AC7230489E80000},  // 1e19
+    {0x0000000000000000, 0xAD78EBC5AC620000},  // 1e20
+    {0x0000000000000000, 0xD8D726B7177A8000},  // 1e21
+    {0x0000000000000000, 0x878678326EAC9000},  // 1e22
+    {0x0000000000000000, 0xA968163F0A57B400},  // 1e23
+    {0x0000000000000000, 0xD3C21BCECCEDA100},  // 1e24
+    {0x0000000000000000, 0x84595161401484A0},  // 1e25
+    {0x0000000000000000, 0xA56FA5B99019A5C8},  // 1e26
+    {0x0000000000000000, 0xCECB8F27F4200F3A},  // 1e27
+    {0x4000000000000000, 0x813F3978F8940984},  // 1e28
+    {0x5000000000000000, 0xA18F07D736B90BE5},  // 1e29
+    {0xA400000000000000, 0xC9F2C9CD04674EDE},  // 1e30
+    {0x4D00000000000000, 0xFC6F7C4045812296},  // 1e31
+    {0xF020000000000000, 0x9DC5ADA82B70B59D},  // 1e32
+    {0x6C28000000000000, 0xC5371912364CE305},  // 1e33
+    {0xC732000000000000, 0xF684DF56C3E01BC6},  // 1e34
+    {0x3C7F400000000000, 0x9A130B963A6C115C},  // 1e35
+    {0x4B9F100000000000, 0xC097CE7BC90715B3},  // 1e36
+    {0x1E86D40000000000, 0xF0BDC21ABB48DB20},  // 1e37
+    {0x1314448000000000, 0x96769950B50D88F4},  // 1e38
+    {0x17D955A000000000, 0xBC143FA4E250EB31},  // 1e39
+    {0x5DCFAB0800000000, 0xEB194F8E1AE525FD},  // 1e40
+    {0x5AA1CAE500000000, 0x92EFD1B8D0CF37BE},  // 1e41
+    {0xF14A3D9E40000000, 0xB7ABC627050305AD},  // 1e42
+    {0x6D9CCD05D0000000, 0xE596B7B0C643C719},  // 1e43
+    {0xE4820023A2000000, 0x8F7E32CE7BEA5C6F},  // 1e44
+    {0xDDA2802C8A800000, 0xB35DBF821AE4F38B},  // 1e45
+    {0xD50B2037AD200000, 0xE0352F62A19E306E},  // 1e46
+    {0x4526F422CC340000, 0x8C213D9DA502DE45},  // 1e47
+    {0x9670B12B7F410000, 0xAF298D050E4395D6},  // 1e48
+    {0x3C0CDD765F114000, 0xDAF3F04651D47B4C},  // 1e49
+    {0xA5880A69FB6AC800, 0x88D8762BF324CD0F},  // 1e50
+    {0x8EEA0D047A457A00, 0xAB0E93B6EFEE0053},  // 1e51
+    {0x72A4904598D6D880, 0xD5D238A4ABE98068},  // 1e52
+    {0x47A6DA2B7F864750, 0x85A36366EB71F041},  // 1e53
+    {0x999090B65F67D924, 0xA70C3C40A64E6C51},  // 1e54
+    {0xFFF4B4E3F741CF6D, 0xD0CF4B50CFE20765},  // 1e55
+    {0xBFF8F10E7A8921A4, 0x82818F1281ED449F},  // 1e56
+    {0xAFF72D52192B6A0D, 0xA321F2D7226895C7},  // 1e57
+    {0x9BF4F8A69F764490, 0xCBEA6F8CEB02BB39},  // 1e58
+    {0x02F236D04753D5B4, 0xFEE50B7025C36A08},  // 1e59
+    {0x01D762422C946590, 0x9F4F2726179A2245},  // 1e60
+    {0x424D3AD2B7B97EF5, 0xC722F0EF9D80AAD6},  // 1e61
+    {0xD2E0898765A7DEB2, 0xF8EBAD2B84E0D58B},  // 1e62
+    {0x63CC55F49F88EB2F, 0x9B934C3B330C8577},  // 1e63
+    {0x3CBF6B71C76B25FB, 0xC2781F49FFCFA6D5},  // 1e64
+    {0x8BEF464E3945EF7A, 0xF316271C7FC3908A},  // 1e65
+    {0x97758BF0E3CBB5AC, 0x97EDD871CFDA3A56},  // 1e66
+    {0x3D52EEED1CBEA317, 0xBDE94E8E43D0C8EC},  // 1e67
+    {0x4CA7AAA863EE4BDD, 0xED63A231D4C4FB27},  // 1e68
+    {0x8FE8CAA93E74EF6A, 0x945E455F24FB1CF8},  // 1e69
+    {0xB3E2FD538E122B44, 0xB975D6B6EE39E436},  // 1e70
+    {0x60DBBCA87196B616, 0xE7D34C64A9C85D44},  // 1e71
+    {0xBC8955E946FE31CD, 0x90E40FBEEA1D3A4A},  // 1e72
+    {0x6BABAB6398BDBE41, 0xB51D13AEA4A488DD},  // 1e73
+    {0xC696963C7EED2DD1, 0xE264589A4DCDAB14},  // 1e74
+    {0xFC1E1DE5CF543CA2, 0x8D7EB76070A08AEC},  // 1e75
+    {0x3B25A55F43294BCB, 0xB0DE65388CC8ADA8},  // 1e76
+    {0x49EF0EB713F39EBE, 0xDD15FE86AFFAD912},  // 1e77
+    {0x6E3569326C784337, 0x8A2DBF142DFCC7AB},  // 1e78
+    {0x49C2C37F07965404, 0xACB92ED9397BF996},  // 1e79
+    {0xDC33745EC97BE906, 0xD7E77A8F87DAF7FB},  // 1e80
+    {0x69A028BB3DED71A3, 0x86F0AC99B4E8DAFD},  // 1e81
+    {0xC40832EA0D68CE0C, 0xA8ACD7C0222311BC},  // 1e82
+    {0xF50A3FA490C30190, 0xD2D80DB02AABD62B},  // 1e83
+    {0x792667C6DA79E0FA, 0x83C7088E1AAB65DB},  // 1e84
+    {0x577001B891185938, 0xA4B8CAB1A1563F52},  // 1e85
+    {0xED4C0226B55E6F86, 0xCDE6FD5E09ABCF26},  // 1e86
+    {0x544F8158315B05B4, 0x80B05E5AC60B6178},  // 1e87
+    {0x696361AE3DB1C721, 0xA0DC75F1778E39D6},  // 1e88
+    {0x03BC3A19CD1E38E9, 0xC913936DD571C84C},  // 1e89
+    {0x04AB48A04065C723, 0xFB5878494ACE3A5F},  // 1e90
+    {0x62EB0D64283F9C76, 0x9D174B2DCEC0E47B},  // 1e91
+    {0x3BA5D0BD324F8394, 0xC45D1DF942711D9A},  // 1e92
+    {0xCA8F44EC7EE36479, 0xF5746577930D6500},  // 1e93
+    {0x7E998B13CF4E1ECB, 0x9968BF6ABBE85F20},  // 1e94
+    {0x9E3FEDD8C321A67E, 0xBFC2EF456AE276E8},  // 1e95
+    {0xC5CFE94EF3EA101E, 0xEFB3AB16C59B14A2},  // 1e96
+    {0xBBA1F1D158724A12, 0x95D04AEE3B80ECE5},  // 1e97
+    {0x2A8A6E45AE8EDC97, 0xBB445DA9CA61281F},  // 1e98
+    {0xF52D09D71A3293BD, 0xEA1575143CF97226},  // 1e99
+    {0x593C2626705F9C56, 0x924D692CA61BE758},  // 1e100
+    {0x6F8B2FB00C77836C, 0xB6E0C377CFA2E12E},  // 1e101
+    {0x0B6DFB9C0F956447, 0xE498F455C38B997A},  // 1e102
+    {0x4724BD4189BD5EAC, 0x8EDF98B59A373FEC},  // 1e103
+    {0x58EDEC91EC2CB657, 0xB2977EE300C50FE7},  // 1e104
+    {0x2F2967B66737E3ED, 0xDF3D5E9BC0F653E1},  // 1e105
+    {0xBD79E0D20082EE74, 0x8B865B215899F46C},  // 1e106
+    {0xECD8590680A3AA11, 0xAE67F1E9AEC07187},  // 1e107
+    {0xE80E6F4820CC9495, 0xDA01EE641A708DE9},  // 1e108
+    {0x3109058D147FDCDD, 0x884134FE908658B2},  // 1e109
+    {0xBD4B46F0599FD415, 0xAA51823E34A7EEDE},  // 1e110
+    {0x6C9E18AC7007C91A, 0xD4E5E2CDC1D1EA96},  // 1e111
+    {0x03E2CF6BC604DDB0, 0x850FADC09923329E},  // 1e112
+    {0x84DB8346B786151C, 0xA6539930BF6BFF45},  // 1e113
+    {0xE612641865679A63, 0xCFE87F7CEF46FF16},  // 1e114
+    {0x4FCB7E8F3F60C07E, 0x81F14FAE158C5F6E},  // 1e115
+    {0xE3BE5E330F38F09D, 0xA26DA3999AEF7749},  // 1e116
+    {0x5CADF5BFD3072CC5, 0xCB090C8001AB551C},  // 1e117
+    {0x73D9732FC7C8F7F6, 0xFDCB4FA002162A63},  // 1e118
+    {0x2867E7FDDCDD9AFA, 0x9E9F11C4014DDA7E},  // 1e119
+    {0xB281E1FD541501B8, 0xC646D63501A1511D},  // 1e120
+    {0x1F225A7CA91A4226, 0xF7D88BC24209A565},  // 1e121
+    {0x3375788DE9B06958, 0x9AE757596946075F},  // 1e122
+    {0x0052D6B1641C83AE, 0xC1A12D2FC3978937},  // 1e123
+    {0xC0678C5DBD23A49A, 0xF209787BB47D6B84},  // 1e124
+    {0xF840B7BA963646E0, 0x9745EB4D50CE6332},  // 1e125
+    {0xB650E5A93BC3D898, 0xBD176620A501FBFF},  // 1e126
+    {0xA3E51F138AB4CEBE, 0xEC5D3FA8CE427AFF},  // 1e127
+    {0xC66F336C36B10137, 0x93BA47C980E98CDF},  // 1e128
+    {0xB80B0047445D4184, 0xB8A8D9BBE123F017},  // 1e129
+    {0xA60DC059157491E5, 0xE6D3102AD96CEC1D},  // 1e130
+    {0x87C89837AD68DB2F, 0x9043EA1AC7E41392},  // 1e131
+    {0x29BABE4598C311FB, 0xB454E4A179DD1877},  // 1e132
+    {0xF4296DD6FEF3D67A, 0xE16A1DC9D8545E94},  // 1e133
+    {0x1899E4A65F58660C, 0x8CE2529E2734BB1D},  // 1e134
+    {0x5EC05DCFF72E7F8F, 0xB01AE745B101E9E4},  // 1e135
+    {0x76707543F4FA1F73, 0xDC21A1171D42645D},  // 1e136
+    {0x6A06494A791C53A8, 0x899504AE72497EBA},  // 1e137
+    {0x0487DB9D17636892, 0xABFA45DA0EDBDE69},  // 1e138
+    {0x45A9D2845D3C42B6, 0xD6F8D7509292D603},  // 1e139
+    {0x0B8A2392BA45A9B2, 0x865B86925B9BC5C2},  // 1e140
+    {0x8E6CAC7768D7141E, 0xA7F26836F282B732},  // 1e141
+    {0x3207D795430CD926, 0xD1EF0244AF2364FF},  // 1e142
+    {0x7F44E6BD49E807B8, 0x8335616AED761F1F},  // 1e143
+    {0x5F16206C9C6209A6, 0xA402B9C5A8D3A6E7},  // 1e144
+    {0x36DBA887C37A8C0F, 0xCD036837130890A1},  // 1e145
+    {0xC2494954DA2C9789, 0x802221226BE55A64},  // 1e146
+    {0xF2DB9BAA10B7BD6C, 0xA02AA96B06DEB0FD},  // 1e147
+    {0x6F92829494E5ACC7, 0xC83553C5C8965D3D},  // 1e148
+    {0xCB772339BA1F17F9, 0xFA42A8B73ABBF48C},  // 1e149
+    {0xFF2A760414536EFB, 0x9C69A97284B578D7},  // 1e150
+    {0xFEF5138519684ABA, 0xC38413CF25E2D70D},  // 1e151
+    {0x7EB258665FC25D69, 0xF46518C2EF5B8CD1},  // 1e152
+    {0xEF2F773FFBD97A61, 0x98BF2F79D5993802},  // 1e153
+    {0xAAFB550FFACFD8FA, 0xBEEEFB584AFF8603},  // 1e154
+    {0x95BA2A53F983CF38, 0xEEAABA2E5DBF6784},  // 1e155
+    {0xDD945A747BF26183, 0x952AB45CFA97A0B2},  // 1e156
+    {0x94F971119AEEF9E4, 0xBA756174393D88DF},  // 1e157
+    {0x7A37CD5601AAB85D, 0xE912B9D1478CEB17},  // 1e158
+    {0xAC62E055C10AB33A, 0x91ABB422CCB812EE},  // 1e159
+    {0x577B986B314D6009, 0xB616A12B7FE617AA},  // 1e160
+    {0xED5A7E85FDA0B80B, 0xE39C49765FDF9D94},  // 1e161
+    {0x14588F13BE847307, 0x8E41ADE9FBEBC27D},  // 1e162
+    {0x596EB2D8AE258FC8, 0xB1D219647AE6B31C},  // 1e163
+    {0x6FCA5F8ED9AEF3BB, 0xDE469FBD99A05FE3},  // 1e164
+    {0x25DE7BB9480D5854, 0x8AEC23D680043BEE},  // 1e165
+    {0xAF561AA79A10AE6A, 0xADA72CCC20054AE9},  // 1e166
+    {0x1B2BA1518094DA04, 0xD910F7FF28069DA4},  // 1e167
+    {0x90FB44D2F05D0842, 0x87AA9AFF79042286},  // 1e168
+    {0x353A1607AC744A53, 0xA99541BF57452B28},  // 1e169
+    {0x42889B8997915CE8, 0xD3FA922F2D1675F2},  // 1e170
+    {0x69956135FEBADA11, 0x847C9B5D7C2E09B7},  // 1e171
+    {0x43FAB9837E699095, 0xA59BC234DB398C25},  // 1e172
+    {0x94F967E45E03F4BB, 0xCF02B2C21207EF2E},  // 1e173
+    {0x1D1BE0EEBAC278F5, 0x8161AFB94B44F57D},  // 1e174
+    {0x6462D92A69731732, 0xA1BA1BA79E1632DC},  // 1e175
+    {0x7D7B8F7503CFDCFE, 0xCA28A291859BBF93},  // 1e176
+    {0x5CDA735244C3D43E, 0xFCB2CB35E702AF78},  // 1e177
+    {0x3A0888136AFA64A7, 0x9DEFBF01B061ADAB},  // 1e178
+    {0x088AAA1845B8FDD0, 0xC56BAEC21C7A1916},  // 1e179
+    {0x8AAD549E57273D45, 0xF6C69A72A3989F5B},  // 1e180
+    {0x36AC54E2F678864B, 0x9A3C2087A63F6399},  // 1e181
+    {0x84576A1BB416A7DD, 0xC0CB28A98FCF3C7F},  // 1e182
+    {0x656D44A2A11C51D5, 0xF0FDF2D3F3C30B9F},  // 1e183
+    {0x9F644AE5A4B1B325, 0x969EB7C47859E743},  // 1e184
+    {0x873D5D9F0DDE1FEE, 0xBC4665B596706114},  // 1e185
+    {0xA90CB506D155A7EA, 0xEB57FF22FC0C7959},  // 1e186
+    {0x09A7F12442D588F2, 0x9316FF75DD87CBD8},  // 1e187
+    {0x0C11ED6D538AEB2F, 0xB7DCBF5354E9BECE},  // 1e188
+    {0x8F1668C8A86DA5FA, 0xE5D3EF282A242E81},  // 1e189
+    {0xF96E017D694487BC, 0x8FA475791A569D10},  // 1e190
+    {0x37C981DCC395A9AC, 0xB38D92D760EC4455},  // 1e191
+    {0x85BBE253F47B1417, 0xE070F78D3927556A},  // 1e192
+    {0x93956D7478CCEC8E, 0x8C469AB843B89562},  // 1e193
+    {0x387AC8D1970027B2, 0xAF58416654A6BABB},  // 1e194
+    {0x06997B05FCC0319E, 0xDB2E51BFE9D0696A},  // 1e195
+    {0x441FECE3BDF81F03, 0x88FCF317F22241E2},  // 1e196
+    {0xD527E81CAD7626C3, 0xAB3C2FDDEEAAD25A},  // 1e197
+    {0x8A71E223D8D3B074, 0xD60B3BD56A5586F1},  // 1e198
+    {0xF6872D5667844E49, 0x85C7056562757456},  // 1e199
+    {0xB428F8AC016561DB, 0xA738C6BEBB12D16C},  // 1e200
+    {0xE13336D701BEBA52, 0xD106F86E69D785C7},  // 1e201
+    {0xECC0024661173473, 0x82A45B450226B39C},  // 1e202
+    {0x27F002D7F95D0190, 0xA34D721642B06084},  // 1e203
+    {0x31EC038DF7B441F4, 0xCC20CE9BD35C78A5},  // 1e204
+    {0x7E67047175A15271, 0xFF290242C83396CE},  // 1e205
+    {0x0F0062C6E984D386, 0x9F79A169BD203E41},  // 1e206
+    {0x52C07B78A3E60868, 0xC75809C42C684DD1},  // 1e207
+    {0xA7709A56CCDF8A82, 0xF92E0C3537826145},  // 1e208
+    {0x88A66076400BB691, 0x9BBCC7A142B17CCB},  // 1e209
+    {0x6ACFF893D00EA435, 0xC2ABF989935DDBFE},  // 1e210
+    {0x0583F6B8C4124D43, 0xF356F7EBF83552FE},  // 1e211
+    {0xC3727A337A8B704A, 0x98165AF37B2153DE},  // 1e212
+    {0x744F18C0592E4C5C, 0xBE1BF1B059E9A8D6},  // 1e213
+    {0x1162DEF06F79DF73, 0xEDA2EE1C7064130C},  // 1e214
+    {0x8ADDCB5645AC2BA8, 0x9485D4D1C63E8BE7},  // 1e215
+    {0x6D953E2BD7173692, 0xB9A74A0637CE2EE1},  // 1e216
+    {0xC8FA8DB6CCDD0437, 0xE8111C87C5C1BA99},  // 1e217
+    {0x1D9C9892400A22A2, 0x910AB1D4DB9914A0},  // 1e218
+    {0x2503BEB6D00CAB4B, 0xB54D5E4A127F59C8},  // 1e219
+    {0x2E44AE64840FD61D, 0xE2A0B5DC971F303A},  // 1e220
+    {0x5CEAECFED289E5D2, 0x8DA471A9DE737E24},  // 1e221
+    {0x7425A83E872C5F47, 0xB10D8E1456105DAD},  // 1e222
+    {0xD12F124E28F77719, 0xDD50F1996B947518},  // 1e223
+    {0x82BD6B70D99AAA6F, 0x8A5296FFE33CC92F},  // 1e224
+    {0x636CC64D1001550B, 0xACE73CBFDC0BFB7B},  // 1e225
+    {0x3C47F7E05401AA4E, 0xD8210BEFD30EFA5A},  // 1e226
+    {0x65ACFAEC34810A71, 0x8714A775E3E95C78},  // 1e227
+    {0x7F1839A741A14D0D, 0xA8D9D1535CE3B396},  // 1e228
+    {0x1EDE48111209A050, 0xD31045A8341CA07C},  // 1e229
+    {0x934AED0AAB460432, 0x83EA2B892091E44D},  // 1e230
+    {0xF81DA84D5617853F, 0xA4E4B66B68B65D60},  // 1e231
+    {0x36251260AB9D668E, 0xCE1DE40642E3F4B9},  // 1e232
+    {0xC1D72B7C6B426019, 0x80D2AE83E9CE78F3},  // 1e233
+    {0xB24CF65B8612F81F, 0xA1075A24E4421730},  // 1e234
+    {0xDEE033F26797B627, 0xC94930AE1D529CFC},  // 1e235
+    {0x169840EF017DA3B1, 0xFB9B7CD9A4A7443C},  // 1e236
+    {0x8E1F289560EE864E, 0x9D412E0806E88AA5},  // 1e237
+    {0xF1A6F2BAB92A27E2, 0xC491798A08A2AD4E},  // 1e238
+    {0xAE10AF696774B1DB, 0xF5B5D7EC8ACB58A2},  // 1e239
+    {0xACCA6DA1E0A8EF29, 0x9991A6F3D6BF1765},  // 1e240
+    {0x17FD090A58D32AF3, 0xBFF610B0CC6EDD3F},  // 1e241
+    {0xDDFC4B4CEF07F5B0, 0xEFF394DCFF8A948E},  // 1e242
+    {0x4ABDAF101564F98E, 0x95F83D0A1FB69CD9},  // 1e243
+    {0x9D6D1AD41ABE37F1, 0xBB764C4CA7A4440F},  // 1e244
+    {0x84C86189216DC5ED, 0xEA53DF5FD18D5513},  // 1e245
+    {0x32FD3CF5B4E49BB4, 0x92746B9BE2F8552C},  // 1e246
+    {0x3FBC8C33221DC2A1, 0xB7118682DBB66A77},  // 1e247
+    {0x0FABAF3FEAA5334A, 0xE4D5E82392A40515},  // 1e248
+    {0x29CB4D87F2A7400E, 0x8F05B1163BA6832D},  // 1e249
+    {0x743E20E9EF511012, 0xB2C71D5BCA9023F8},  // 1e250
+    {0x914DA9246B255416, 0xDF78E4B2BD342CF6},  // 1e251
+    {0x1AD089B6C2F7548E, 0x8BAB8EEFB6409C1A},  // 1e252
+    {0xA184AC2473B529B1, 0xAE9672ABA3D0C320},  // 1e253
+    {0xC9E5D72D90A2741E, 0xDA3C0F568CC4F3E8},  // 1e254
+    {0x7E2FA67C7A658892, 0x8865899617FB1871},  // 1e255
+    {0xDDBB901B98FEEAB7, 0xAA7EEBFB9DF9DE8D},  // 1e256
+    {0x552A74227F3EA565, 0xD51EA6FA85785631},  // 1e257
+    {0xD53A88958F87275F, 0x8533285C936B35DE},  // 1e258
+    {0x8A892ABAF368F137, 0xA67FF273B8460356},  // 1e259
+    {0x2D2B7569B0432D85, 0xD01FEF10A657842C},  // 1e260
+    {0x9C3B29620E29FC73, 0x8213F56A67F6B29B},  // 1e261
+    {0x8349F3BA91B47B8F, 0xA298F2C501F45F42},  // 1e262
+    {0x241C70A936219A73, 0xCB3F2F7642717713},  // 1e263
+    {0xED238CD383AA0110, 0xFE0EFB53D30DD4D7},  // 1e264
+    {0xF4363804324A40AA, 0x9EC95D1463E8A506},  // 1e265
+    {0xB143C6053EDCD0D5, 0xC67BB4597CE2CE48},  // 1e266
+    {0xDD94B7868E94050A, 0xF81AA16FDC1B81DA},  // 1e267
+    {0xCA7CF2B4191C8326, 0x9B10A4E5E9913128},  // 1e268
+    {0xFD1C2F611F63A3F0, 0xC1D4CE1F63F57D72},  // 1e269
+    {0xBC633B39673C8CEC, 0xF24A01A73CF2DCCF},  // 1e270
+    {0xD5BE0503E085D813, 0x976E41088617CA01},  // 1e271
+    {0x4B2D8644D8A74E18, 0xBD49D14AA79DBC82},  // 1e272
+    {0xDDF8E7D60ED1219E, 0xEC9C459D51852BA2},  // 1e273
+    {0xCABB90E5C942B503, 0x93E1AB8252F33B45},  // 1e274
+    {0x3D6A751F3B936243, 0xB8DA1662E7B00A17},  // 1e275
+    {0x0CC512670A783AD4, 0xE7109BFBA19C0C9D},  // 1e276
+    {0x27FB2B80668B24C5, 0x906A617D450187E2},  // 1e277
+    {0xB1F9F660802DEDF6, 0xB484F9DC9641E9DA},  // 1e278
+    {0x5E7873F8A0396973, 0xE1A63853BBD26451},  // 1e279
+    {0xDB0B487B6423E1E8, 0x8D07E33455637EB2},  // 1e280
+    {0x91CE1A9A3D2CDA62, 0xB049DC016ABC5E5F},  // 1e281
+    {0x7641A140CC7810FB, 0xDC5C5301C56B75F7},  // 1e282
+    {0xA9E904C87FCB0A9D, 0x89B9B3E11B6329BA},  // 1e283
+    {0x546345FA9FBDCD44, 0xAC2820D9623BF429},  // 1e284
+    {0xA97C177947AD4095, 0xD732290FBACAF133},  // 1e285
+    {0x49ED8EABCCCC485D, 0x867F59A9D4BED6C0},  // 1e286
+    {0x5C68F256BFFF5A74, 0xA81F301449EE8C70},  // 1e287
+    {0x73832EEC6FFF3111, 0xD226FC195C6A2F8C},  // 1e288
 };
 
-// wuffs_base__private_implementation__f64_powers_of_10 holds powers of 10 that
-// can be exactly represented by a float64 (what C calls a double).
-static const double wuffs_base__private_implementation__f64_powers_of_10[23] = {
+// wuffs_private_impl__f64_powers_of_10 holds powers of 10 that can be exactly
+// represented by a float64 (what C calls a double).
+static const double wuffs_private_impl__f64_powers_of_10[23] = {
     1e0,  1e1,  1e2,  1e3,  1e4,  1e5,  1e6,  1e7,  1e8,  1e9,  1e10, 1e11,
     1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19, 1e20, 1e21, 1e22,
 };
@@ -16335,27 +18094,27 @@
 
 // --------
 
-#define WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE 2047
-#define WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION 800
+#define WUFFS_PRIVATE_IMPL__HPD__DECIMAL_POINT__RANGE 2047
+#define WUFFS_PRIVATE_IMPL__HPD__DIGITS_PRECISION 800
 
-// WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL is the largest N
-// such that ((10 << N) < (1 << 64)).
-#define WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL 60
+// WUFFS_PRIVATE_IMPL__HPD__SHIFT__MAX_INCL is the largest N such that
+// ((10 << N) < (1 << 64)).
+#define WUFFS_PRIVATE_IMPL__HPD__SHIFT__MAX_INCL 60
 
-// wuffs_base__private_implementation__high_prec_dec (abbreviated as HPD) is a
-// fixed precision floating point decimal number, augmented with ±infinity
-// values, but it cannot represent NaN (Not a Number).
+// wuffs_private_impl__high_prec_dec (abbreviated as HPD) is a fixed precision
+// floating point decimal number, augmented with ±infinity values, but it
+// cannot represent NaN (Not a Number).
 //
 // "High precision" means that the mantissa holds 800 decimal digits. 800 is
-// WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION.
+// WUFFS_PRIVATE_IMPL__HPD__DIGITS_PRECISION.
 //
 // An HPD isn't for general purpose arithmetic, only for conversions to and
 // from IEEE 754 double-precision floating point, where the largest and
 // smallest positive, finite values are approximately 1.8e+308 and 4.9e-324.
 // HPD exponents above +2047 mean infinity, below -2047 mean zero. The ±2047
 // bounds are further away from zero than ±(324 + 800), where 800 and 2047 is
-// WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION and
-// WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE.
+// WUFFS_PRIVATE_IMPL__HPD__DIGITS_PRECISION and
+// WUFFS_PRIVATE_IMPL__HPD__DECIMAL_POINT__RANGE.
 //
 // digits[.. num_digits] are the number's digits in big-endian order. The
 // uint8_t values are in the range [0 ..= 9], not ['0' ..= '9'], where e.g. '7'
@@ -16381,43 +18140,40 @@
 // negative is a sign bit. An HPD can distinguish positive and negative zero.
 //
 // truncated is whether there are more than
-// WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION digits, and at
-// least one of those extra digits are non-zero. The existence of long-tail
-// digits can affect rounding.
+// WUFFS_PRIVATE_IMPL__HPD__DIGITS_PRECISION digits, and at least one of those
+// extra digits are non-zero. The existence of long-tail digits can affect
+// rounding.
 //
 // The "all fields are zero" value is valid, and represents the number +0.
-typedef struct wuffs_base__private_implementation__high_prec_dec__struct {
+typedef struct wuffs_private_impl__high_prec_dec__struct {
   uint32_t num_digits;
   int32_t decimal_point;
   bool negative;
   bool truncated;
-  uint8_t digits[WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION];
-} wuffs_base__private_implementation__high_prec_dec;
+  uint8_t digits[WUFFS_PRIVATE_IMPL__HPD__DIGITS_PRECISION];
+} wuffs_private_impl__high_prec_dec;
 
-// wuffs_base__private_implementation__high_prec_dec__trim trims trailing
-// zeroes from the h->digits[.. h->num_digits] slice. They have no benefit,
-// since we explicitly track h->decimal_point.
+// wuffs_private_impl__high_prec_dec__trim trims trailing zeroes from the
+// h->digits[.. h->num_digits] slice. They have no benefit, since we explicitly
+// track h->decimal_point.
 //
 // Preconditions:
 //  - h is non-NULL.
 static inline void  //
-wuffs_base__private_implementation__high_prec_dec__trim(
-    wuffs_base__private_implementation__high_prec_dec* h) {
+wuffs_private_impl__high_prec_dec__trim(wuffs_private_impl__high_prec_dec* h) {
   while ((h->num_digits > 0) && (h->digits[h->num_digits - 1] == 0)) {
     h->num_digits--;
   }
 }
 
-// wuffs_base__private_implementation__high_prec_dec__assign sets h to
-// represent the number x.
+// wuffs_private_impl__high_prec_dec__assign sets h to represent the number x.
 //
 // Preconditions:
 //  - h is non-NULL.
 static void  //
-wuffs_base__private_implementation__high_prec_dec__assign(
-    wuffs_base__private_implementation__high_prec_dec* h,
-    uint64_t x,
-    bool negative) {
+wuffs_private_impl__high_prec_dec__assign(wuffs_private_impl__high_prec_dec* h,
+                                          uint64_t x,
+                                          bool negative) {
   uint32_t n = 0;
 
   // Set h->digits.
@@ -16447,14 +18203,13 @@
   h->decimal_point = (int32_t)n;
   h->negative = negative;
   h->truncated = false;
-  wuffs_base__private_implementation__high_prec_dec__trim(h);
+  wuffs_private_impl__high_prec_dec__trim(h);
 }
 
 static wuffs_base__status  //
-wuffs_base__private_implementation__high_prec_dec__parse(
-    wuffs_base__private_implementation__high_prec_dec* h,
-    wuffs_base__slice_u8 s,
-    uint32_t options) {
+wuffs_private_impl__high_prec_dec__parse(wuffs_private_impl__high_prec_dec* h,
+                                         wuffs_base__slice_u8 s,
+                                         uint32_t options) {
   if (!h) {
     return wuffs_base__make_status(wuffs_base__error__bad_receiver);
   }
@@ -16543,7 +18298,7 @@
       if (p >= q) {
         goto after_all;
       } else if (('0' <= *p) && (*p <= '9')) {
-        if (nd < WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION) {
+        if (nd < WUFFS_PRIVATE_IMPL__HPD__DIGITS_PRECISION) {
           h->digits[nd++] = (uint8_t)(*p - '0');
           dp = (int32_t)nd;
         } else if ('0' != *p) {
@@ -16585,12 +18340,11 @@
       if (nd == 0) {
         // Track leading zeroes implicitly.
         dp--;
-      } else if (nd <
-                 WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION) {
+      } else if (nd < WUFFS_PRIVATE_IMPL__HPD__DIGITS_PRECISION) {
         h->digits[nd++] = (uint8_t)(*p - '0');
       }
     } else if (('0' < *p) && (*p <= '9')) {
-      if (nd < WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION) {
+      if (nd < WUFFS_PRIVATE_IMPL__HPD__DIGITS_PRECISION) {
         h->digits[nd++] = (uint8_t)(*p - '0');
       } else {
         // Long-tail non-zeroes set the truncated bit.
@@ -16626,9 +18380,8 @@
     }
 
     int32_t exp = 0;
-    const int32_t exp_large =
-        WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE +
-        WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION;
+    const int32_t exp_large = WUFFS_PRIVATE_IMPL__HPD__DECIMAL_POINT__RANGE +
+                              WUFFS_PRIVATE_IMPL__HPD__DIGITS_PRECISION;
     bool saw_exp_digits = false;
     for (; p < q; p++) {
       if ((*p == '_') &&
@@ -16659,44 +18412,39 @@
       return wuffs_base__make_status(wuffs_base__error__bad_argument);
     }
     h->decimal_point = 0;
-  } else if (dp <
-             -WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE) {
-    h->decimal_point =
-        -WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE - 1;
-  } else if (dp >
-             +WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE) {
-    h->decimal_point =
-        +WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE + 1;
+  } else if (dp < -WUFFS_PRIVATE_IMPL__HPD__DECIMAL_POINT__RANGE) {
+    h->decimal_point = -WUFFS_PRIVATE_IMPL__HPD__DECIMAL_POINT__RANGE - 1;
+  } else if (dp > +WUFFS_PRIVATE_IMPL__HPD__DECIMAL_POINT__RANGE) {
+    h->decimal_point = +WUFFS_PRIVATE_IMPL__HPD__DECIMAL_POINT__RANGE + 1;
   } else {
     h->decimal_point = dp;
   }
-  wuffs_base__private_implementation__high_prec_dec__trim(h);
+  wuffs_private_impl__high_prec_dec__trim(h);
   return wuffs_base__make_status(NULL);
 }
 
 // --------
 
-// wuffs_base__private_implementation__high_prec_dec__lshift_num_new_digits
-// returns the number of additional decimal digits when left-shifting by shift.
+// wuffs_private_impl__high_prec_dec__lshift_num_new_digits returns the number
+// of additional decimal digits when left-shifting by shift.
 //
 // See below for preconditions.
 static uint32_t  //
-wuffs_base__private_implementation__high_prec_dec__lshift_num_new_digits(
-    wuffs_base__private_implementation__high_prec_dec* h,
+wuffs_private_impl__high_prec_dec__lshift_num_new_digits(
+    wuffs_private_impl__high_prec_dec* h,
     uint32_t shift) {
   // Masking with 0x3F should be unnecessary (assuming the preconditions) but
   // it's cheap and ensures that we don't overflow the
-  // wuffs_base__private_implementation__hpd_left_shift array.
+  // wuffs_private_impl__hpd_left_shift array.
   shift &= 63;
 
-  uint32_t x_a = wuffs_base__private_implementation__hpd_left_shift[shift];
-  uint32_t x_b = wuffs_base__private_implementation__hpd_left_shift[shift + 1];
+  uint32_t x_a = wuffs_private_impl__hpd_left_shift[shift];
+  uint32_t x_b = wuffs_private_impl__hpd_left_shift[shift + 1];
   uint32_t num_new_digits = x_a >> 11;
   uint32_t pow5_a = 0x7FF & x_a;
   uint32_t pow5_b = 0x7FF & x_b;
 
-  const uint8_t* pow5 =
-      &wuffs_base__private_implementation__powers_of_5[pow5_a];
+  const uint8_t* pow5 = &wuffs_private_impl__powers_of_5[pow5_a];
   uint32_t i = 0;
   uint32_t n = pow5_b - pow5_a;
   for (; i < n; i++) {
@@ -16715,9 +18463,9 @@
 
 // --------
 
-// wuffs_base__private_implementation__high_prec_dec__rounded_integer returns
-// the integral (non-fractional) part of h, provided that it is 18 or fewer
-// decimal digits. For 19 or more digits, it returns UINT64_MAX. Note that:
+// wuffs_private_impl__high_prec_dec__rounded_integer returns the integral
+// (non-fractional) part of h, provided that it is 18 or fewer decimal digits.
+// For 19 or more digits, it returns UINT64_MAX. Note that:
 //  - (1 << 53) is    9007199254740992, which has 16 decimal digits.
 //  - (1 << 56) is   72057594037927936, which has 17 decimal digits.
 //  - (1 << 59) is  576460752303423488, which has 18 decimal digits.
@@ -16730,8 +18478,8 @@
 //
 // See below for preconditions.
 static uint64_t  //
-wuffs_base__private_implementation__high_prec_dec__rounded_integer(
-    wuffs_base__private_implementation__high_prec_dec* h) {
+wuffs_private_impl__high_prec_dec__rounded_integer(
+    wuffs_private_impl__high_prec_dec* h) {
   if ((h->num_digits == 0) || (h->decimal_point < 0)) {
     return 0;
   } else if (h->decimal_point > 18) {
@@ -16762,8 +18510,8 @@
   return n;
 }
 
-// wuffs_base__private_implementation__high_prec_dec__small_xshift shifts h's
-// number (where 'x' is 'l' or 'r' for left or right) by a small shift value.
+// wuffs_private_impl__high_prec_dec__small_xshift shifts h's number (where 'x'
+// is 'l' or 'r' for left or right) by a small shift value.
 //
 // Preconditions:
 //  - h is non-NULL.
@@ -16771,31 +18519,29 @@
 //  - shift is non-zero.
 //  - shift is "a small shift".
 //
-// "Not extreme" means within
-// ±WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE.
+// "Not extreme" means within ±WUFFS_PRIVATE_IMPL__HPD__DECIMAL_POINT__RANGE.
 //
 // "A small shift" means not more than
-// WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL.
+// WUFFS_PRIVATE_IMPL__HPD__SHIFT__MAX_INCL.
 //
-// wuffs_base__private_implementation__high_prec_dec__rounded_integer and
-// wuffs_base__private_implementation__high_prec_dec__lshift_num_new_digits
-// have the same preconditions.
+// wuffs_private_impl__high_prec_dec__rounded_integer and
+// wuffs_private_impl__high_prec_dec__lshift_num_new_digits have the same
+// preconditions.
 //
-// wuffs_base__private_implementation__high_prec_dec__lshift keeps the first
-// two preconditions but not the last two. Its shift argument is signed and
-// does not need to be "small": zero is a no-op, positive means left shift and
-// negative means right shift.
+// wuffs_private_impl__high_prec_dec__lshift keeps the first two preconditions
+// but not the last two. Its shift argument is signed and does not need to be
+// "small": zero is a no-op, positive means left shift and negative means right
+// shift.
 
 static void  //
-wuffs_base__private_implementation__high_prec_dec__small_lshift(
-    wuffs_base__private_implementation__high_prec_dec* h,
+wuffs_private_impl__high_prec_dec__small_lshift(
+    wuffs_private_impl__high_prec_dec* h,
     uint32_t shift) {
   if (h->num_digits == 0) {
     return;
   }
   uint32_t num_new_digits =
-      wuffs_base__private_implementation__high_prec_dec__lshift_num_new_digits(
-          h, shift);
+      wuffs_private_impl__high_prec_dec__lshift_num_new_digits(h, shift);
   uint32_t rx = h->num_digits - 1;                   // Read  index.
   uint32_t wx = h->num_digits - 1 + num_new_digits;  // Write index.
   uint64_t n = 0;
@@ -16805,7 +18551,7 @@
     n += ((uint64_t)(h->digits[rx])) << shift;
     uint64_t quo = n / 10;
     uint64_t rem = n - (10 * quo);
-    if (wx < WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION) {
+    if (wx < WUFFS_PRIVATE_IMPL__HPD__DIGITS_PRECISION) {
       h->digits[wx] = (uint8_t)rem;
     } else if (rem > 0) {
       h->truncated = true;
@@ -16819,7 +18565,7 @@
   while (n > 0) {
     uint64_t quo = n / 10;
     uint64_t rem = n - (10 * quo);
-    if (wx < WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION) {
+    if (wx < WUFFS_PRIVATE_IMPL__HPD__DIGITS_PRECISION) {
       h->digits[wx] = (uint8_t)rem;
     } else if (rem > 0) {
       h->truncated = true;
@@ -16830,17 +18576,16 @@
 
   // Finish.
   h->num_digits += num_new_digits;
-  if (h->num_digits >
-      WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION) {
-    h->num_digits = WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION;
+  if (h->num_digits > WUFFS_PRIVATE_IMPL__HPD__DIGITS_PRECISION) {
+    h->num_digits = WUFFS_PRIVATE_IMPL__HPD__DIGITS_PRECISION;
   }
   h->decimal_point += (int32_t)num_new_digits;
-  wuffs_base__private_implementation__high_prec_dec__trim(h);
+  wuffs_private_impl__high_prec_dec__trim(h);
 }
 
 static void  //
-wuffs_base__private_implementation__high_prec_dec__small_rshift(
-    wuffs_base__private_implementation__high_prec_dec* h,
+wuffs_private_impl__high_prec_dec__small_rshift(
+    wuffs_private_impl__high_prec_dec* h,
     uint32_t shift) {
   uint32_t rx = 0;  // Read  index.
   uint32_t wx = 0;  // Write index.
@@ -16864,8 +18609,7 @@
     }
   }
   h->decimal_point -= ((int32_t)(rx - 1));
-  if (h->decimal_point <
-      -WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE) {
+  if (h->decimal_point < -WUFFS_PRIVATE_IMPL__HPD__DECIMAL_POINT__RANGE) {
     // After the shift, h's number is effectively zero.
     h->num_digits = 0;
     h->decimal_point = 0;
@@ -16885,7 +18629,7 @@
   while (n > 0) {
     uint8_t new_digit = ((uint8_t)(n >> shift));
     n = 10 * (n & mask);
-    if (wx < WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DIGITS_PRECISION) {
+    if (wx < WUFFS_PRIVATE_IMPL__HPD__DIGITS_PRECISION) {
       h->digits[wx++] = new_digit;
     } else if (new_digit > 0) {
       h->truncated = true;
@@ -16894,62 +18638,58 @@
 
   // Finish.
   h->num_digits = wx;
-  wuffs_base__private_implementation__high_prec_dec__trim(h);
+  wuffs_private_impl__high_prec_dec__trim(h);
 }
 
 static void  //
-wuffs_base__private_implementation__high_prec_dec__lshift(
-    wuffs_base__private_implementation__high_prec_dec* h,
-    int32_t shift) {
+wuffs_private_impl__high_prec_dec__lshift(wuffs_private_impl__high_prec_dec* h,
+                                          int32_t shift) {
   if (shift > 0) {
-    while (shift > +WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL) {
-      wuffs_base__private_implementation__high_prec_dec__small_lshift(
-          h, WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL);
-      shift -= WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL;
+    while (shift > +WUFFS_PRIVATE_IMPL__HPD__SHIFT__MAX_INCL) {
+      wuffs_private_impl__high_prec_dec__small_lshift(
+          h, WUFFS_PRIVATE_IMPL__HPD__SHIFT__MAX_INCL);
+      shift -= WUFFS_PRIVATE_IMPL__HPD__SHIFT__MAX_INCL;
     }
-    wuffs_base__private_implementation__high_prec_dec__small_lshift(
-        h, ((uint32_t)(+shift)));
+    wuffs_private_impl__high_prec_dec__small_lshift(h, ((uint32_t)(+shift)));
   } else if (shift < 0) {
-    while (shift < -WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL) {
-      wuffs_base__private_implementation__high_prec_dec__small_rshift(
-          h, WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL);
-      shift += WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL;
+    while (shift < -WUFFS_PRIVATE_IMPL__HPD__SHIFT__MAX_INCL) {
+      wuffs_private_impl__high_prec_dec__small_rshift(
+          h, WUFFS_PRIVATE_IMPL__HPD__SHIFT__MAX_INCL);
+      shift += WUFFS_PRIVATE_IMPL__HPD__SHIFT__MAX_INCL;
     }
-    wuffs_base__private_implementation__high_prec_dec__small_rshift(
-        h, ((uint32_t)(-shift)));
+    wuffs_private_impl__high_prec_dec__small_rshift(h, ((uint32_t)(-shift)));
   }
 }
 
 // --------
 
-// wuffs_base__private_implementation__high_prec_dec__round_etc rounds h's
-// number. For those functions that take an n argument, rounding produces at
-// most n digits (which is not necessarily at most n decimal places). Negative
-// n values are ignored, as well as any n greater than or equal to h's number
-// of digits. The etc__round_just_enough function implicitly chooses an n to
-// implement WUFFS_BASE__RENDER_NUMBER_FXX__JUST_ENOUGH_PRECISION.
+// wuffs_private_impl__high_prec_dec__round_etc rounds h's number. For those
+// functions that take an n argument, rounding produces at most n digits (which
+// is not necessarily at most n decimal places). Negative n values are ignored,
+// as well as any n greater than or equal to h's number of digits. The
+// etc__round_just_enough function implicitly chooses an n to implement
+// WUFFS_BASE__RENDER_NUMBER_FXX__JUST_ENOUGH_PRECISION.
 //
 // Preconditions:
 //  - h is non-NULL.
 //  - h->decimal_point is "not extreme".
 //
-// "Not extreme" means within
-// ±WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE.
+// "Not extreme" means within ±WUFFS_PRIVATE_IMPL__HPD__DECIMAL_POINT__RANGE.
 
 static void  //
-wuffs_base__private_implementation__high_prec_dec__round_down(
-    wuffs_base__private_implementation__high_prec_dec* h,
+wuffs_private_impl__high_prec_dec__round_down(
+    wuffs_private_impl__high_prec_dec* h,
     int32_t n) {
   if ((n < 0) || (h->num_digits <= (uint32_t)n)) {
     return;
   }
   h->num_digits = (uint32_t)(n);
-  wuffs_base__private_implementation__high_prec_dec__trim(h);
+  wuffs_private_impl__high_prec_dec__trim(h);
 }
 
 static void  //
-wuffs_base__private_implementation__high_prec_dec__round_up(
-    wuffs_base__private_implementation__high_prec_dec* h,
+wuffs_private_impl__high_prec_dec__round_up(
+    wuffs_private_impl__high_prec_dec* h,
     int32_t n) {
   if ((n < 0) || (h->num_digits <= (uint32_t)n)) {
     return;
@@ -16970,8 +18710,8 @@
 }
 
 static void  //
-wuffs_base__private_implementation__high_prec_dec__round_nearest(
-    wuffs_base__private_implementation__high_prec_dec* h,
+wuffs_private_impl__high_prec_dec__round_nearest(
+    wuffs_private_impl__high_prec_dec* h,
     int32_t n) {
   if ((n < 0) || (h->num_digits <= (uint32_t)n)) {
     return;
@@ -16983,15 +18723,15 @@
   }
 
   if (up) {
-    wuffs_base__private_implementation__high_prec_dec__round_up(h, n);
+    wuffs_private_impl__high_prec_dec__round_up(h, n);
   } else {
-    wuffs_base__private_implementation__high_prec_dec__round_down(h, n);
+    wuffs_private_impl__high_prec_dec__round_down(h, n);
   }
 }
 
 static void  //
-wuffs_base__private_implementation__high_prec_dec__round_just_enough(
-    wuffs_base__private_implementation__high_prec_dec* h,
+wuffs_private_impl__high_prec_dec__round_just_enough(
+    wuffs_private_impl__high_prec_dec* h,
     int32_t exp2,
     uint64_t mantissa) {
   // The magic numbers 52 and 53 in this function are because IEEE 754 double
@@ -17029,11 +18769,10 @@
     l_exp2 = exp2 - 1;
     l_mantissa = (2 * mantissa) - 1;
   }
-  wuffs_base__private_implementation__high_prec_dec lower;
-  wuffs_base__private_implementation__high_prec_dec__assign(
-      &lower, (2 * l_mantissa) + 1, false);
-  wuffs_base__private_implementation__high_prec_dec__lshift(&lower,
-                                                            l_exp2 - 53);
+  wuffs_private_impl__high_prec_dec lower;
+  wuffs_private_impl__high_prec_dec__assign(&lower, (2 * l_mantissa) + 1,
+                                            false);
+  wuffs_private_impl__high_prec_dec__lshift(&lower, l_exp2 - 53);
 
   // Next, the upper bound. Our number f is:
   //   ((mantissa + 0)       * (2 ** (exp2 - 52)))
@@ -17043,10 +18782,9 @@
   //
   // The upper bound is halfway between them (noting that 52 became 53):
   //   (((2 * mantissa) + 1) * (2 ** (exp2 - 53)))
-  wuffs_base__private_implementation__high_prec_dec upper;
-  wuffs_base__private_implementation__high_prec_dec__assign(
-      &upper, (2 * mantissa) + 1, false);
-  wuffs_base__private_implementation__high_prec_dec__lshift(&upper, exp2 - 53);
+  wuffs_private_impl__high_prec_dec upper;
+  wuffs_private_impl__high_prec_dec__assign(&upper, (2 * mantissa) + 1, false);
+  wuffs_private_impl__high_prec_dec__lshift(&upper, exp2 - 53);
 
   // The lower and upper bounds are possible outputs only if the original
   // mantissa is even, so that IEEE round-to-even would round to the original
@@ -17129,17 +18867,15 @@
     // way, do it. If we can't round, continue the loop.
     if (can_round_down) {
       if (can_round_up) {
-        wuffs_base__private_implementation__high_prec_dec__round_nearest(
-            h, hi + 1);
+        wuffs_private_impl__high_prec_dec__round_nearest(h, hi + 1);
         return;
       } else {
-        wuffs_base__private_implementation__high_prec_dec__round_down(h,
-                                                                      hi + 1);
+        wuffs_private_impl__high_prec_dec__round_down(h, hi + 1);
         return;
       }
     } else {
       if (can_round_up) {
-        wuffs_base__private_implementation__high_prec_dec__round_up(h, hi + 1);
+        wuffs_private_impl__high_prec_dec__round_up(h, hi + 1);
         return;
       }
     }
@@ -17148,9 +18884,9 @@
 
 // --------
 
-// wuffs_base__private_implementation__parse_number_f64_eisel_lemire produces
-// the IEEE 754 double-precision value for an exact mantissa and base-10
-// exponent. For example:
+// wuffs_private_impl__parse_number_f64_eisel_lemire produces the IEEE 754
+// double-precision value for an exact mantissa and base-10 exponent. For
+// example:
 //  - when parsing "12345.678e+02", man is 12345678 and exp10 is -1.
 //  - when parsing "-12", man is 12 and exp10 is 0. Processing the leading
 //    minus sign is the responsibility of the caller, not this function.
@@ -17169,7 +18905,7 @@
 // Preconditions:
 //  - man is non-zero.
 //  - exp10 is in the range [-307 ..= 288], the same range of the
-//    wuffs_base__private_implementation__powers_of_10 array.
+//    wuffs_private_impl__powers_of_10 array.
 //
 // The exp10 range (and the fact that man is in the range [1 ..= UINT64_MAX],
 // approximately [1 ..= 1.85e+19]) means that (man * (10 ** exp10)) is in the
@@ -17177,14 +18913,11 @@
 // (neither subnormal nor non-finite) f64 values: DBL_MIN and DBL_MAX are
 // approximately 2.23e–308 and 1.80e+308.
 static int64_t  //
-wuffs_base__private_implementation__parse_number_f64_eisel_lemire(
-    uint64_t man,
-    int32_t exp10) {
+wuffs_private_impl__parse_number_f64_eisel_lemire(uint64_t man, int32_t exp10) {
   // Look up the (possibly truncated) base-2 representation of (10 ** exp10).
   // The look-up table was constructed so that it is already normalized: the
   // table entry's mantissa's MSB (most significant bit) is on.
-  const uint64_t* po10 =
-      &wuffs_base__private_implementation__powers_of_10[exp10 + 307][0];
+  const uint64_t* po10 = &wuffs_private_impl__powers_of_10[exp10 + 307][0];
 
   // Normalize the man argument. The (man != 0) precondition means that a
   // non-zero bit exists.
@@ -17342,9 +19075,8 @@
 // --------
 
 static wuffs_base__result_f64  //
-wuffs_base__private_implementation__parse_number_f64_special(
-    wuffs_base__slice_u8 s,
-    uint32_t options) {
+wuffs_private_impl__parse_number_f64_special(wuffs_base__slice_u8 s,
+                                             uint32_t options) {
   do {
     if (options & WUFFS_BASE__PARSE_NUMBER_FXX__REJECT_INF_AND_NAN) {
       goto fail;
@@ -17448,17 +19180,16 @@
 }
 
 WUFFS_BASE__MAYBE_STATIC wuffs_base__result_f64  //
-wuffs_base__private_implementation__high_prec_dec__to_f64(
-    wuffs_base__private_implementation__high_prec_dec* h,
-    uint32_t options) {
+wuffs_private_impl__high_prec_dec__to_f64(wuffs_private_impl__high_prec_dec* h,
+                                          uint32_t options) {
   do {
     // powers converts decimal powers of 10 to binary powers of 2. For example,
     // (10000 >> 13) is 1. It stops before the elements exceed 60, also known
-    // as WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL.
+    // as WUFFS_PRIVATE_IMPL__HPD__SHIFT__MAX_INCL.
     //
     // This rounds down (1<<13 is a lower bound for 1e4). Adding 1 to the array
     // element value rounds up (1<<14 is an upper bound for 1e4) while staying
-    // at or below WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL.
+    // at or below WUFFS_PRIVATE_IMPL__HPD__SHIFT__MAX_INCL.
     //
     // When starting in the range [1e+1 .. 1e+2] (i.e. h->decimal_point == +2),
     // powers[2] == 6 and so:
@@ -17513,14 +19244,12 @@
       }
       while (man != 0) {  // The 'while' is just an 'if' that we can 'break'.
         int64_t r0 =
-            wuffs_base__private_implementation__parse_number_f64_eisel_lemire(
-                man + 0, exp10);
+            wuffs_private_impl__parse_number_f64_eisel_lemire(man + 0, exp10);
         if (r0 < 0) {
           break;
         } else if (h->num_digits > 19) {
           int64_t r1 =
-              wuffs_base__private_implementation__parse_number_f64_eisel_lemire(
-                  man + 1, exp10);
+              wuffs_private_impl__parse_number_f64_eisel_lemire(man + 1, exp10);
           if (r1 != r0) {
             break;
           }
@@ -17544,14 +19273,12 @@
     int32_t exp2 = 0;
     while (h->decimal_point > 1) {
       uint32_t n = (uint32_t)(+h->decimal_point);
-      uint32_t shift =
-          (n < num_powers)
-              ? powers[n]
-              : WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL;
+      uint32_t shift = (n < num_powers)
+                           ? powers[n]
+                           : WUFFS_PRIVATE_IMPL__HPD__SHIFT__MAX_INCL;
 
-      wuffs_base__private_implementation__high_prec_dec__small_rshift(h, shift);
-      if (h->decimal_point <
-          -WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE) {
+      wuffs_private_impl__high_prec_dec__small_rshift(h, shift);
+      if (h->decimal_point < -WUFFS_PRIVATE_IMPL__HPD__DECIMAL_POINT__RANGE) {
         goto zero;
       }
       exp2 += (int32_t)shift;
@@ -17563,12 +19290,11 @@
       shift = (n < num_powers)
                   // The +1 is per "when targeting h->decimal_point being +0 or
                   // +1... when left shifting" in the powers comment above.
-                  ? (powers[n] + 1)
-                  : WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL;
+                  ? (powers[n] + 1u)
+                  : WUFFS_PRIVATE_IMPL__HPD__SHIFT__MAX_INCL;
 
-      wuffs_base__private_implementation__high_prec_dec__small_lshift(h, shift);
-      if (h->decimal_point >
-          +WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__DECIMAL_POINT__RANGE) {
+      wuffs_private_impl__high_prec_dec__small_lshift(h, shift);
+      if (h->decimal_point > +WUFFS_PRIVATE_IMPL__HPD__DECIMAL_POINT__RANGE) {
         goto infinity;
       }
       exp2 -= (int32_t)shift;
@@ -17609,10 +19335,10 @@
     // The minimum normal exponent is (f64_bias + 1).
     while ((f64_bias + 1) > exp2) {
       uint32_t n = (uint32_t)((f64_bias + 1) - exp2);
-      if (n > WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL) {
-        n = WUFFS_BASE__PRIVATE_IMPLEMENTATION__HPD__SHIFT__MAX_INCL;
+      if (n > WUFFS_PRIVATE_IMPL__HPD__SHIFT__MAX_INCL) {
+        n = WUFFS_PRIVATE_IMPL__HPD__SHIFT__MAX_INCL;
       }
-      wuffs_base__private_implementation__high_prec_dec__small_rshift(h, n);
+      wuffs_private_impl__high_prec_dec__small_rshift(h, n);
       exp2 += (int32_t)n;
     }
 
@@ -17622,10 +19348,8 @@
     }
 
     // Extract 53 bits for the mantissa (in base-2).
-    wuffs_base__private_implementation__high_prec_dec__small_lshift(
-        h, final_lshift);
-    uint64_t man2 =
-        wuffs_base__private_implementation__high_prec_dec__rounded_integer(h);
+    wuffs_private_impl__high_prec_dec__small_lshift(h, final_lshift);
+    uint64_t man2 = wuffs_private_impl__high_prec_dec__rounded_integer(h);
 
     // Rounding might have added one bit. If so, shift and re-check overflow.
     if ((man2 >> 53) != 0) {
@@ -17683,7 +19407,7 @@
 }
 
 static inline bool  //
-wuffs_base__private_implementation__is_decimal_digit(uint8_t c) {
+wuffs_private_impl__is_decimal_digit(uint8_t c) {
   return ('0' <= c) && (c <= '9');
 }
 
@@ -17744,13 +19468,13 @@
     if (*p == '0') {
       man = 0;
       p++;
-      if (wuffs_base__private_implementation__is_decimal_digit(*p)) {
+      if (wuffs_private_impl__is_decimal_digit(*p)) {
         goto fallback;
       }
-    } else if (wuffs_base__private_implementation__is_decimal_digit(*p)) {
+    } else if (wuffs_private_impl__is_decimal_digit(*p)) {
       man = ((uint8_t)(*p - '0'));
       p++;
-      for (; wuffs_base__private_implementation__is_decimal_digit(*p); p++) {
+      for (; wuffs_private_impl__is_decimal_digit(*p); p++) {
         man = (10 * man) + ((uint8_t)(*p - '0'));
       }
     } else {
@@ -17766,12 +19490,12 @@
              : '.')) {
       p++;
       const uint8_t* first_after_separator_ptr = p;
-      if (!wuffs_base__private_implementation__is_decimal_digit(*p)) {
+      if (!wuffs_private_impl__is_decimal_digit(*p)) {
         goto fallback;
       }
       man = (10 * man) + ((uint8_t)(*p - '0'));
       p++;
-      for (; wuffs_base__private_implementation__is_decimal_digit(*p); p++) {
+      for (; wuffs_private_impl__is_decimal_digit(*p); p++) {
         man = (10 * man) + ((uint8_t)(*p - '0'));
       }
       exp10 = ((int32_t)(first_after_separator_ptr - p));
@@ -17796,7 +19520,7 @@
       } else if (*p == '+') {
         p++;
       }
-      if (!wuffs_base__private_implementation__is_decimal_digit(*p)) {
+      if (!wuffs_private_impl__is_decimal_digit(*p)) {
         goto fallback;
       }
       int32_t exp_num = ((uint8_t)(*p - '0'));
@@ -17804,15 +19528,15 @@
       // The rest of the exp_num walking has a peculiar control flow but, once
       // again, the "script/process-json-numbers.c with -p" benchmark is
       // sensitive to alternative formulations.
-      if (wuffs_base__private_implementation__is_decimal_digit(*p)) {
+      if (wuffs_private_impl__is_decimal_digit(*p)) {
         exp_num = (10 * exp_num) + ((uint8_t)(*p - '0'));
         p++;
       }
-      if (wuffs_base__private_implementation__is_decimal_digit(*p)) {
+      if (wuffs_private_impl__is_decimal_digit(*p)) {
         exp_num = (10 * exp_num) + ((uint8_t)(*p - '0'));
         p++;
       }
-      while (wuffs_base__private_implementation__is_decimal_digit(*p)) {
+      while (wuffs_private_impl__is_decimal_digit(*p)) {
         if (exp_num > 0x1000000) {
           goto fallback;
         }
@@ -17856,8 +19580,8 @@
       }
     }
 
-    // The wuffs_base__private_implementation__parse_number_f64_eisel_lemire
-    // preconditions include that exp10 is in the range [-307 ..= 288].
+    // The wuffs_private_impl__parse_number_f64_eisel_lemire preconditions
+    // include that exp10 is in the range [-307 ..= 288].
     if ((exp10 < -307) || (288 < exp10)) {
       goto fallback;
     }
@@ -17867,9 +19591,9 @@
     if ((-22 <= exp10) && (exp10 <= 22) && ((man >> 53) == 0)) {
       double d = (double)man;
       if (exp10 >= 0) {
-        d *= wuffs_base__private_implementation__f64_powers_of_10[+exp10];
+        d *= wuffs_private_impl__f64_powers_of_10[+exp10];
       } else {
-        d /= wuffs_base__private_implementation__f64_powers_of_10[-exp10];
+        d /= wuffs_private_impl__f64_powers_of_10[-exp10];
       }
       wuffs_base__result_f64 ret;
       ret.status.repr = NULL;
@@ -17877,17 +19601,15 @@
       return ret;
     }
 
-    // The wuffs_base__private_implementation__parse_number_f64_eisel_lemire
-    // preconditions include that man is non-zero. Parsing "0" should be caught
-    // by the "If both man and (10 ** exp10)" above, but "0e99" might not.
+    // The wuffs_private_impl__parse_number_f64_eisel_lemire preconditions
+    // include that man is non-zero. Parsing "0" should be caught by the "If
+    // both man and (10 ** exp10)" above, but "0e99" might not.
     if (man == 0) {
       goto fallback;
     }
 
     // Our man and exp10 are in range. Run the Eisel-Lemire algorithm.
-    int64_t r =
-        wuffs_base__private_implementation__parse_number_f64_eisel_lemire(
-            man, exp10);
+    int64_t r = wuffs_private_impl__parse_number_f64_eisel_lemire(man, exp10);
     if (r < 0) {
       goto fallback;
     }
@@ -17900,25 +19622,22 @@
 
 fallback:
   do {
-    wuffs_base__private_implementation__high_prec_dec h;
+    wuffs_private_impl__high_prec_dec h;
     wuffs_base__status status =
-        wuffs_base__private_implementation__high_prec_dec__parse(&h, s,
-                                                                 options);
+        wuffs_private_impl__high_prec_dec__parse(&h, s, options);
     if (status.repr) {
-      return wuffs_base__private_implementation__parse_number_f64_special(
-          s, options);
+      return wuffs_private_impl__parse_number_f64_special(s, options);
     }
-    return wuffs_base__private_implementation__high_prec_dec__to_f64(&h,
-                                                                     options);
+    return wuffs_private_impl__high_prec_dec__to_f64(&h, options);
   } while (0);
 }
 
 // --------
 
 static inline size_t  //
-wuffs_base__private_implementation__render_inf(wuffs_base__slice_u8 dst,
-                                               bool neg,
-                                               uint32_t options) {
+wuffs_private_impl__render_inf(wuffs_base__slice_u8 dst,
+                               bool neg,
+                               uint32_t options) {
   if (neg) {
     if (dst.len < 4) {
       return 0;
@@ -17943,7 +19662,7 @@
 }
 
 static inline size_t  //
-wuffs_base__private_implementation__render_nan(wuffs_base__slice_u8 dst) {
+wuffs_private_impl__render_nan(wuffs_base__slice_u8 dst) {
   if (dst.len < 3) {
     return 0;
   }
@@ -17952,9 +19671,9 @@
 }
 
 static size_t  //
-wuffs_base__private_implementation__high_prec_dec__render_exponent_absent(
+wuffs_private_impl__high_prec_dec__render_exponent_absent(
     wuffs_base__slice_u8 dst,
-    wuffs_base__private_implementation__high_prec_dec* h,
+    wuffs_private_impl__high_prec_dec* h,
     uint32_t precision,
     uint32_t options) {
   size_t n = (h->negative ||
@@ -18019,9 +19738,9 @@
 }
 
 static size_t  //
-wuffs_base__private_implementation__high_prec_dec__render_exponent_present(
+wuffs_private_impl__high_prec_dec__render_exponent_present(
     wuffs_base__slice_u8 dst,
-    wuffs_base__private_implementation__high_prec_dec* h,
+    wuffs_private_impl__high_prec_dec* h,
     uint32_t precision,
     uint32_t options) {
   int32_t exp = 0;
@@ -18118,9 +19837,9 @@
   // unless x is subnormal. Also take care of Inf and NaN.
   if (exp2 == 0x7FF) {
     if (man != 0) {
-      return wuffs_base__private_implementation__render_nan(dst);
+      return wuffs_private_impl__render_nan(dst);
     }
-    return wuffs_base__private_implementation__render_inf(dst, neg, options);
+    return wuffs_private_impl__render_inf(dst, neg, options);
   } else if (exp2 == 0) {
     exp2 = -1022;
   } else {
@@ -18134,11 +19853,11 @@
   }
 
   // Convert from the (neg, exp2, man) tuple to an HPD.
-  wuffs_base__private_implementation__high_prec_dec h;
-  wuffs_base__private_implementation__high_prec_dec__assign(&h, man, neg);
+  wuffs_private_impl__high_prec_dec h;
+  wuffs_private_impl__high_prec_dec__assign(&h, man, neg);
   if (h.num_digits > 0) {
-    wuffs_base__private_implementation__high_prec_dec__lshift(
-        &h, exp2 - 52);  // 52 mantissa bits.
+    wuffs_private_impl__high_prec_dec__lshift(&h,
+                                              exp2 - 52);  // 52 mantissa bits.
   }
 
   // Handle the "%e" and "%f" formats.
@@ -18146,27 +19865,25 @@
                      WUFFS_BASE__RENDER_NUMBER_FXX__EXPONENT_PRESENT)) {
     case WUFFS_BASE__RENDER_NUMBER_FXX__EXPONENT_ABSENT:  // The "%"f" format.
       if (options & WUFFS_BASE__RENDER_NUMBER_FXX__JUST_ENOUGH_PRECISION) {
-        wuffs_base__private_implementation__high_prec_dec__round_just_enough(
-            &h, exp2, man);
+        wuffs_private_impl__high_prec_dec__round_just_enough(&h, exp2, man);
         int32_t p = ((int32_t)(h.num_digits)) - h.decimal_point;
         precision = ((uint32_t)(wuffs_base__i32__max(0, p)));
       } else {
-        wuffs_base__private_implementation__high_prec_dec__round_nearest(
+        wuffs_private_impl__high_prec_dec__round_nearest(
             &h, ((int32_t)precision) + h.decimal_point);
       }
-      return wuffs_base__private_implementation__high_prec_dec__render_exponent_absent(
+      return wuffs_private_impl__high_prec_dec__render_exponent_absent(
           dst, &h, precision, options);
 
     case WUFFS_BASE__RENDER_NUMBER_FXX__EXPONENT_PRESENT:  // The "%e" format.
       if (options & WUFFS_BASE__RENDER_NUMBER_FXX__JUST_ENOUGH_PRECISION) {
-        wuffs_base__private_implementation__high_prec_dec__round_just_enough(
-            &h, exp2, man);
+        wuffs_private_impl__high_prec_dec__round_just_enough(&h, exp2, man);
         precision = (h.num_digits > 0) ? (h.num_digits - 1) : 0;
       } else {
-        wuffs_base__private_implementation__high_prec_dec__round_nearest(
+        wuffs_private_impl__high_prec_dec__round_nearest(
             &h, ((int32_t)precision) + 1);
       }
-      return wuffs_base__private_implementation__high_prec_dec__render_exponent_present(
+      return wuffs_private_impl__high_prec_dec__render_exponent_present(
           dst, &h, precision, options);
   }
 
@@ -18175,16 +19892,14 @@
   // rounding and determine whether to use "%e" or "%f".
   int32_t e_threshold = 0;
   if (options & WUFFS_BASE__RENDER_NUMBER_FXX__JUST_ENOUGH_PRECISION) {
-    wuffs_base__private_implementation__high_prec_dec__round_just_enough(
-        &h, exp2, man);
+    wuffs_private_impl__high_prec_dec__round_just_enough(&h, exp2, man);
     precision = h.num_digits;
     e_threshold = 6;
   } else {
     if (precision == 0) {
       precision = 1;
     }
-    wuffs_base__private_implementation__high_prec_dec__round_nearest(
-        &h, ((int32_t)precision));
+    wuffs_private_impl__high_prec_dec__round_nearest(&h, ((int32_t)precision));
     e_threshold = ((int32_t)precision);
     int32_t nd = ((int32_t)(h.num_digits));
     if ((e_threshold > nd) && (nd >= h.decimal_point)) {
@@ -18196,7 +19911,7 @@
   int32_t e = h.decimal_point - 1;
   if ((e < -4) || (e_threshold <= e)) {
     uint32_t p = wuffs_base__u32__min(precision, h.num_digits);
-    return wuffs_base__private_implementation__high_prec_dec__render_exponent_present(
+    return wuffs_private_impl__high_prec_dec__render_exponent_present(
         dst, &h, (p > 0) ? (p - 1) : 0, options);
   }
 
@@ -18206,7 +19921,7 @@
     p = ((int32_t)(h.num_digits));
   }
   precision = ((uint32_t)(wuffs_base__i32__max(0, p - h.decimal_point)));
-  return wuffs_base__private_implementation__high_prec_dec__render_exponent_absent(
+  return wuffs_private_impl__high_prec_dec__render_exponent_absent(
       dst, &h, precision, options);
 }
 
@@ -18306,7 +20021,7 @@
     // 8     9     A     B     C     D     E     F
 };
 
-static const uint8_t wuffs_base__private_implementation__encode_base16[16] = {
+static const uint8_t wuffs_private_impl__encode_base16[16] = {
     0x30, 0x31, 0x32, 0x33, 0x34, 0x35, 0x36, 0x37,  // 0x00 ..= 0x07.
     0x38, 0x39, 0x41, 0x42, 0x43, 0x44, 0x45, 0x46,  // 0x08 ..= 0x0F.
 };
@@ -18559,10 +20274,10 @@
 };
 
 static size_t  //
-wuffs_base__private_implementation__render_number_u64(wuffs_base__slice_u8 dst,
-                                                      uint64_t x,
-                                                      uint32_t options,
-                                                      bool neg) {
+wuffs_private_impl__render_number_u64(wuffs_base__slice_u8 dst,
+                                      uint64_t x,
+                                      uint32_t options,
+                                      bool neg) {
   uint8_t buf[WUFFS_BASE__U64__BYTE_LENGTH__MAX_INCL];
   uint8_t* ptr = &buf[0] + sizeof(buf);
 
@@ -18616,16 +20331,14 @@
   if (neg) {
     u = 1 + ~u;
   }
-  return wuffs_base__private_implementation__render_number_u64(dst, u, options,
-                                                               neg);
+  return wuffs_private_impl__render_number_u64(dst, u, options, neg);
 }
 
 WUFFS_BASE__MAYBE_STATIC size_t  //
 wuffs_base__render_number_u64(wuffs_base__slice_u8 dst,
                               uint64_t x,
                               uint32_t options) {
-  return wuffs_base__private_implementation__render_number_u64(dst, x, options,
-                                                               false);
+  return wuffs_private_impl__render_number_u64(dst, x, options, false);
 }
 
 // ---------------- Base-16
@@ -18732,8 +20445,8 @@
 
   while (n--) {
     uint8_t c = *s;
-    d[0] = wuffs_base__private_implementation__encode_base16[c >> 4];
-    d[1] = wuffs_base__private_implementation__encode_base16[c & 0x0F];
+    d[0] = wuffs_private_impl__encode_base16[c >> 4];
+    d[1] = wuffs_private_impl__encode_base16[c & 0x0F];
     d += 2;
     s += 1;
   }
@@ -18771,8 +20484,8 @@
     uint8_t c = *s;
     d[0] = '\\';
     d[1] = 'x';
-    d[2] = wuffs_base__private_implementation__encode_base16[c >> 4];
-    d[3] = wuffs_base__private_implementation__encode_base16[c & 0x0F];
+    d[2] = wuffs_private_impl__encode_base16[c >> 4];
+    d[3] = wuffs_private_impl__encode_base16[c & 0x0F];
     d += 4;
     s += 1;
   }
@@ -19252,6 +20965,7 @@
       {+0x424D5020, "\x01\x42\x4D"},              // BMP
       {+0x47494620, "\x03\x47\x49\x46\x38"},      // GIF
       {+0x54494646, "\x03\x49\x49\x2A\x00"},      // TIFF (little-endian)
+      {+0x4C5A4950, "\x04\x4C\x5A\x49\x50\x01"},  // LZIP
       {+0x54494646, "\x03\x4D\x4D\x00\x2A"},      // TIFF (big-endian)
       {+0x4E50424D, "\x02\x50\x35\x0A"},          // NPBM (P5; *.pgm)
       {+0x4E50424D, "\x02\x50\x36\x0A"},          // NPBM (P6; *.ppm)
@@ -19368,7 +21082,15 @@
 #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
 WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgrw__bgr__x86_sse42(uint8_t* dst_ptr,
+                                                 size_t dst_len,
+                                                 uint8_t* dst_palette_ptr,
+                                                 size_t dst_palette_len,
+                                                 const uint8_t* src_ptr,
+                                                 size_t src_len);
+
+static uint64_t  //
+wuffs_private_impl__swizzle_bgrw__rgb__x86_sse42(uint8_t* dst_ptr,
                                                  size_t dst_len,
                                                  uint8_t* dst_palette_ptr,
                                                  size_t dst_palette_len,
@@ -19377,7 +21099,7 @@
 
 WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
 static uint64_t  //
-wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_swap_rgbx_bgrx__x86_sse42(uint8_t* dst_ptr,
                                                       size_t dst_len,
                                                       uint8_t* dst_palette_ptr,
                                                       size_t dst_palette_len,
@@ -19386,7 +21108,7 @@
 
 WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxxx__y__x86_sse42(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_xxxx__y__x86_sse42(uint8_t* dst_ptr,
                                                size_t dst_len,
                                                uint8_t* dst_palette_ptr,
                                                size_t dst_palette_len,
@@ -19397,7 +21119,7 @@
 // --------
 
 static inline uint32_t  //
-wuffs_base__swap_u32_argb_abgr(uint32_t u) {
+wuffs_private_impl__swap_u32_argb_abgr(uint32_t u) {
   uint32_t o = u & 0xFF00FF00ul;
   uint32_t r = u & 0x00FF0000ul;
   uint32_t b = u & 0x000000FFul;
@@ -19405,7 +21127,7 @@
 }
 
 static inline uint64_t  //
-wuffs_base__swap_u64_argb_abgr(uint64_t u) {
+wuffs_private_impl__swap_u64_argb_abgr(uint64_t u) {
   uint64_t o = u & 0xFFFF0000FFFF0000ull;
   uint64_t r = u & 0x0000FFFF00000000ull;
   uint64_t b = u & 0x000000000000FFFFull;
@@ -19413,7 +21135,7 @@
 }
 
 static inline uint32_t  //
-wuffs_base__color_u64__as__color_u32__swap_u32_argb_abgr(uint64_t c) {
+wuffs_private_impl__color_u64__as__color_u32__swap_u32_argb_abgr(uint64_t c) {
   uint32_t a = ((uint32_t)(0xFF & (c >> 56)));
   uint32_t r = ((uint32_t)(0xFF & (c >> 40)));
   uint32_t g = ((uint32_t)(0xFF & (c >> 24)));
@@ -19460,6 +21182,10 @@
       return 0xFF000000 | (0x00010101 * ((uint32_t)(row[(2 * x) + 1])));
     case WUFFS_BASE__PIXEL_FORMAT__Y_16BE:
       return 0xFF000000 | (0x00010101 * ((uint32_t)(row[(2 * x) + 0])));
+    case WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL:
+      return wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(
+          (((uint32_t)(row[(2 * x) + 1])) << 24) |
+          (((uint32_t)(row[(2 * x) + 0])) * 0x00010101));
 
     case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL: {
       uint8_t* palette = pb->private_impl.planes[3].ptr;
@@ -19485,20 +21211,20 @@
              wuffs_base__peek_u32le__no_bounds_check(row + (4 * ((size_t)x)));
 
     case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      return wuffs_base__swap_u32_argb_abgr(
+      return wuffs_private_impl__swap_u32_argb_abgr(
           0xFF000000 |
           wuffs_base__peek_u24le__no_bounds_check(row + (3 * ((size_t)x))));
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      return wuffs_base__swap_u32_argb_abgr(
+      return wuffs_private_impl__swap_u32_argb_abgr(
           wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(
               wuffs_base__peek_u32le__no_bounds_check(row +
                                                       (4 * ((size_t)x)))));
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-      return wuffs_base__swap_u32_argb_abgr(
+      return wuffs_private_impl__swap_u32_argb_abgr(
           wuffs_base__peek_u32le__no_bounds_check(row + (4 * ((size_t)x))));
     case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      return wuffs_base__swap_u32_argb_abgr(
+      return wuffs_private_impl__swap_u32_argb_abgr(
           0xFF000000 |
           wuffs_base__peek_u32le__no_bounds_check(row + (4 * ((size_t)x))));
 
@@ -19557,6 +21283,12 @@
           row + (2 * ((size_t)x)),
           wuffs_base__color_u32_argb_premul__as__color_u16_gray(color));
       break;
+    case WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL:
+      wuffs_base__poke_u16le__no_bounds_check(
+          row + (2 * ((size_t)x)),
+          wuffs_base__color_u32_argb_premul__as__color_u16_alpha_gray_nonpremul(
+              color));
+      break;
 
     case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:
@@ -19590,18 +21322,20 @@
 
     case WUFFS_BASE__PIXEL_FORMAT__RGB:
       wuffs_base__poke_u24le__no_bounds_check(
-          row + (3 * ((size_t)x)), wuffs_base__swap_u32_argb_abgr(color));
+          row + (3 * ((size_t)x)),
+          wuffs_private_impl__swap_u32_argb_abgr(color));
       break;
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
       wuffs_base__poke_u32le__no_bounds_check(
           row + (4 * ((size_t)x)),
           wuffs_base__color_u32_argb_premul__as__color_u32_argb_nonpremul(
-              wuffs_base__swap_u32_argb_abgr(color)));
+              wuffs_private_impl__swap_u32_argb_abgr(color)));
       break;
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__RGBX:
       wuffs_base__poke_u32le__no_bounds_check(
-          row + (4 * ((size_t)x)), wuffs_base__swap_u32_argb_abgr(color));
+          row + (4 * ((size_t)x)),
+          wuffs_private_impl__swap_u32_argb_abgr(color));
       break;
 
     default:
@@ -19615,7 +21349,7 @@
 // --------
 
 static inline void  //
-wuffs_base__pixel_buffer__set_color_u32_fill_rect__xx(
+wuffs_private_impl__pixel_buffer__set_color_u32_fill_rect__xx(
     wuffs_base__pixel_buffer* pb,
     wuffs_base__rect_ie_u32 rect,
     uint16_t color) {
@@ -19646,7 +21380,7 @@
 }
 
 static inline void  //
-wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxx(
+wuffs_private_impl__pixel_buffer__set_color_u32_fill_rect__xxx(
     wuffs_base__pixel_buffer* pb,
     wuffs_base__rect_ie_u32 rect,
     uint32_t color) {
@@ -19677,7 +21411,7 @@
 }
 
 static inline void  //
-wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxxx(
+wuffs_private_impl__pixel_buffer__set_color_u32_fill_rect__xxxx(
     wuffs_base__pixel_buffer* pb,
     wuffs_base__rect_ie_u32 rect,
     uint32_t color) {
@@ -19708,7 +21442,7 @@
 }
 
 static inline void  //
-wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxxxxxxx(
+wuffs_private_impl__pixel_buffer__set_color_u32_fill_rect__xxxxxxxx(
     wuffs_base__pixel_buffer* pb,
     wuffs_base__rect_ie_u32 rect,
     uint64_t color) {
@@ -19762,46 +21496,48 @@
   switch (pb->pixcfg.private_impl.pixfmt.repr) {
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxxx(pb, rect, color);
+      wuffs_private_impl__pixel_buffer__set_color_u32_fill_rect__xxxx(pb, rect,
+                                                                      color);
       return wuffs_base__make_status(NULL);
 
       // Common formats above. Rarer formats below.
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      wuffs_base__pixel_buffer__set_color_u32_fill_rect__xx(
+      wuffs_private_impl__pixel_buffer__set_color_u32_fill_rect__xx(
           pb, rect,
           wuffs_base__color_u32_argb_premul__as__color_u16_rgb_565(color));
       return wuffs_base__make_status(NULL);
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxx(pb, rect, color);
+      wuffs_private_impl__pixel_buffer__set_color_u32_fill_rect__xxx(pb, rect,
+                                                                     color);
       return wuffs_base__make_status(NULL);
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxxx(
+      wuffs_private_impl__pixel_buffer__set_color_u32_fill_rect__xxxx(
           pb, rect,
           wuffs_base__color_u32_argb_premul__as__color_u32_argb_nonpremul(
               color));
       return wuffs_base__make_status(NULL);
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxxxxxxx(
+      wuffs_private_impl__pixel_buffer__set_color_u32_fill_rect__xxxxxxxx(
           pb, rect,
           wuffs_base__color_u32_argb_premul__as__color_u64_argb_nonpremul(
               color));
       return wuffs_base__make_status(NULL);
 
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxxx(
+      wuffs_private_impl__pixel_buffer__set_color_u32_fill_rect__xxxx(
           pb, rect,
           wuffs_base__color_u32_argb_premul__as__color_u32_argb_nonpremul(
-              wuffs_base__swap_u32_argb_abgr(color)));
+              wuffs_private_impl__swap_u32_argb_abgr(color)));
       return wuffs_base__make_status(NULL);
 
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      wuffs_base__pixel_buffer__set_color_u32_fill_rect__xxxx(
-          pb, rect, wuffs_base__swap_u32_argb_abgr(color));
+      wuffs_private_impl__pixel_buffer__set_color_u32_fill_rect__xxxx(
+          pb, rect, wuffs_private_impl__swap_u32_argb_abgr(color));
       return wuffs_base__make_status(NULL);
   }
 
@@ -19880,8 +21616,9 @@
 // --------
 
 static inline uint32_t  //
-wuffs_base__composite_nonpremul_nonpremul_u32_axxx(uint32_t dst_nonpremul,
-                                                   uint32_t src_nonpremul) {
+wuffs_private_impl__composite_nonpremul_nonpremul_u32_axxx(
+    uint32_t dst_nonpremul,
+    uint32_t src_nonpremul) {
   // Extract 16-bit color components.
   //
   // If the destination is transparent then SRC_OVER is equivalent to SRC: just
@@ -19933,8 +21670,9 @@
 }
 
 static inline uint64_t  //
-wuffs_base__composite_nonpremul_nonpremul_u64_axxx(uint64_t dst_nonpremul,
-                                                   uint64_t src_nonpremul) {
+wuffs_private_impl__composite_nonpremul_nonpremul_u64_axxx(
+    uint64_t dst_nonpremul,
+    uint64_t src_nonpremul) {
   // Extract components.
   //
   // If the destination is transparent then SRC_OVER is equivalent to SRC: just
@@ -19980,8 +21718,8 @@
 }
 
 static inline uint32_t  //
-wuffs_base__composite_nonpremul_premul_u32_axxx(uint32_t dst_nonpremul,
-                                                uint32_t src_premul) {
+wuffs_private_impl__composite_nonpremul_premul_u32_axxx(uint32_t dst_nonpremul,
+                                                        uint32_t src_premul) {
   // Extract 16-bit color components.
   uint32_t da = 0x101 * (0xFF & (dst_nonpremul >> 24));
   uint32_t dr = 0x101 * (0xFF & (dst_nonpremul >> 16));
@@ -20024,8 +21762,8 @@
 }
 
 static inline uint64_t  //
-wuffs_base__composite_nonpremul_premul_u64_axxx(uint64_t dst_nonpremul,
-                                                uint64_t src_premul) {
+wuffs_private_impl__composite_nonpremul_premul_u64_axxx(uint64_t dst_nonpremul,
+                                                        uint64_t src_premul) {
   // Extract components.
   uint64_t da = 0xFFFF & (dst_nonpremul >> 48);
   uint64_t dr = 0xFFFF & (dst_nonpremul >> 32);
@@ -20062,8 +21800,9 @@
 }
 
 static inline uint32_t  //
-wuffs_base__composite_premul_nonpremul_u32_axxx(uint32_t dst_premul,
-                                                uint32_t src_nonpremul) {
+wuffs_private_impl__composite_premul_nonpremul_u32_axxx(
+    uint32_t dst_premul,
+    uint32_t src_nonpremul) {
   // Extract 16-bit color components.
   uint32_t da = 0x101 * (0xFF & (dst_premul >> 24));
   uint32_t dr = 0x101 * (0xFF & (dst_premul >> 16));
@@ -20094,8 +21833,9 @@
 }
 
 static inline uint64_t  //
-wuffs_base__composite_premul_nonpremul_u64_axxx(uint64_t dst_premul,
-                                                uint64_t src_nonpremul) {
+wuffs_private_impl__composite_premul_nonpremul_u64_axxx(
+    uint64_t dst_premul,
+    uint64_t src_nonpremul) {
   // Extract components.
   uint64_t da = 0xFFFF & (dst_premul >> 48);
   uint64_t dr = 0xFFFF & (dst_premul >> 32);
@@ -20120,8 +21860,8 @@
 }
 
 static inline uint32_t  //
-wuffs_base__composite_premul_premul_u32_axxx(uint32_t dst_premul,
-                                             uint32_t src_premul) {
+wuffs_private_impl__composite_premul_premul_u32_axxx(uint32_t dst_premul,
+                                                     uint32_t src_premul) {
   // Extract 16-bit color components.
   uint32_t da = 0x101 * (0xFF & (dst_premul >> 24));
   uint32_t dr = 0x101 * (0xFF & (dst_premul >> 16));
@@ -20154,7 +21894,7 @@
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__squash_align4_bgr_565_8888(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_squash_align4_bgr_565_8888(uint8_t* dst_ptr,
                                                        size_t dst_len,
                                                        const uint8_t* src_ptr,
                                                        size_t src_len,
@@ -20185,7 +21925,7 @@
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__swap_rgb_bgr(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_swap_rgb_bgr(uint8_t* dst_ptr,
                                          size_t dst_len,
                                          uint8_t* dst_palette_ptr,
                                          size_t dst_palette_len,
@@ -20213,7 +21953,7 @@
 #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
 WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
 static uint64_t  //
-wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_swap_rgbx_bgrx__x86_sse42(uint8_t* dst_ptr,
                                                       size_t dst_len,
                                                       uint8_t* dst_palette_ptr,
                                                       size_t dst_palette_len,
@@ -20258,7 +21998,7 @@
 // ‼ WUFFS MULTI-FILE SECTION -x86_sse42
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__swap_rgbx_bgrx(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_swap_rgbx_bgrx(uint8_t* dst_ptr,
                                            size_t dst_len,
                                            uint8_t* dst_palette_ptr,
                                            size_t dst_palette_len,
@@ -20287,7 +22027,7 @@
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__copy_1_1(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_copy_1_1(uint8_t* dst_ptr,
                                      size_t dst_len,
                                      uint8_t* dst_palette_ptr,
                                      size_t dst_palette_len,
@@ -20301,7 +22041,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__copy_2_2(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_copy_2_2(uint8_t* dst_ptr,
                                      size_t dst_len,
                                      uint8_t* dst_palette_ptr,
                                      size_t dst_palette_len,
@@ -20317,7 +22057,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__copy_3_3(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_copy_3_3(uint8_t* dst_ptr,
                                      size_t dst_len,
                                      uint8_t* dst_palette_ptr,
                                      size_t dst_palette_len,
@@ -20333,7 +22073,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__copy_4_4(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_copy_4_4(uint8_t* dst_ptr,
                                      size_t dst_len,
                                      uint8_t* dst_palette_ptr,
                                      size_t dst_palette_len,
@@ -20349,7 +22089,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__copy_8_8(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_copy_8_8(uint8_t* dst_ptr,
                                      size_t dst_len,
                                      uint8_t* dst_palette_ptr,
                                      size_t dst_palette_len,
@@ -20367,7 +22107,7 @@
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgr(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr_565__bgr(uint8_t* dst_ptr,
                                          size_t dst_len,
                                          uint8_t* dst_palette_ptr,
                                          size_t dst_palette_len,
@@ -20383,9 +22123,9 @@
   // TODO: unroll.
 
   while (n >= 1) {
-    uint32_t b5 = s[0] >> 3;
-    uint32_t g6 = s[1] >> 2;
-    uint32_t r5 = s[2] >> 3;
+    uint32_t b5 = (uint32_t)(s[0] >> 3);
+    uint32_t g6 = (uint32_t)(s[1] >> 2);
+    uint32_t r5 = (uint32_t)(s[2] >> 3);
     uint32_t rgb_565 = (r5 << 11) | (g6 << 5) | (b5 << 0);
     wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)rgb_565);
 
@@ -20398,7 +22138,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgrx(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr_565__bgrx(uint8_t* dst_ptr,
                                           size_t dst_len,
                                           uint8_t* dst_palette_ptr,
                                           size_t dst_palette_len,
@@ -20414,9 +22154,9 @@
   // TODO: unroll.
 
   while (n >= 1) {
-    uint32_t b5 = s[0] >> 3;
-    uint32_t g6 = s[1] >> 2;
-    uint32_t r5 = s[2] >> 3;
+    uint32_t b5 = (uint32_t)(s[0] >> 3);
+    uint32_t g6 = (uint32_t)(s[1] >> 2);
+    uint32_t r5 = (uint32_t)(s[2] >> 3);
     uint32_t rgb_565 = (r5 << 11) | (g6 << 5) | (b5 << 0);
     wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)rgb_565);
 
@@ -20429,7 +22169,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul__src(
+wuffs_private_impl__swizzle_bgr_565__bgra_nonpremul__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -20461,7 +22201,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul_4x16le__src(
+wuffs_private_impl__swizzle_bgr_565__bgra_nonpremul_4x16le__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -20493,7 +22233,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul__src_over(
+wuffs_private_impl__swizzle_bgr_565__bgra_nonpremul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -20549,7 +22289,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul_4x16le__src_over(
+wuffs_private_impl__swizzle_bgr_565__bgra_nonpremul_4x16le__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -20605,7 +22345,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgra_premul__src(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr_565__bgra_premul__src(uint8_t* dst_ptr,
                                                       size_t dst_len,
                                                       uint8_t* dst_palette_ptr,
                                                       size_t dst_palette_len,
@@ -20634,7 +22374,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__bgra_premul__src_over(
+wuffs_private_impl__swizzle_bgr_565__bgra_premul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -20690,7 +22430,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__rgb(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr_565__rgb(uint8_t* dst_ptr,
                                          size_t dst_len,
                                          uint8_t* dst_palette_ptr,
                                          size_t dst_palette_len,
@@ -20706,9 +22446,9 @@
   // TODO: unroll.
 
   while (n >= 1) {
-    uint32_t r5 = s[0] >> 3;
-    uint32_t g6 = s[1] >> 2;
-    uint32_t b5 = s[2] >> 3;
+    uint32_t r5 = (uint32_t)(s[0] >> 3);
+    uint32_t g6 = (uint32_t)(s[1] >> 2);
+    uint32_t b5 = (uint32_t)(s[2] >> 3);
     uint32_t rgb_565 = (r5 << 11) | (g6 << 5) | (b5 << 0);
     wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)rgb_565);
 
@@ -20721,7 +22461,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__rgba_nonpremul__src(
+wuffs_private_impl__swizzle_bgr_565__rgba_nonpremul__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -20741,7 +22481,7 @@
     wuffs_base__poke_u16le__no_bounds_check(
         d + (0 * 2),
         wuffs_base__color_u32_argb_premul__as__color_u16_rgb_565(
-            wuffs_base__swap_u32_argb_abgr(
+            wuffs_private_impl__swap_u32_argb_abgr(
                 wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(
                     wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4))))));
 
@@ -20754,7 +22494,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__rgba_nonpremul__src_over(
+wuffs_private_impl__swizzle_bgr_565__rgba_nonpremul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -20810,7 +22550,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__rgba_premul__src(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr_565__rgba_premul__src(uint8_t* dst_ptr,
                                                       size_t dst_len,
                                                       uint8_t* dst_palette_ptr,
                                                       size_t dst_palette_len,
@@ -20829,7 +22569,7 @@
     wuffs_base__poke_u16le__no_bounds_check(
         d + (0 * 2),
         wuffs_base__color_u32_argb_premul__as__color_u16_rgb_565(
-            wuffs_base__swap_u32_argb_abgr(
+            wuffs_private_impl__swap_u32_argb_abgr(
                 wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)))));
 
     s += 1 * 4;
@@ -20841,7 +22581,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__rgba_premul__src_over(
+wuffs_private_impl__swizzle_bgr_565__rgba_premul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -20897,7 +22637,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__y(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr_565__y(uint8_t* dst_ptr,
                                        size_t dst_len,
                                        uint8_t* dst_palette_ptr,
                                        size_t dst_palette_len,
@@ -20912,8 +22652,8 @@
   // TODO: unroll.
 
   while (n >= 1) {
-    uint32_t y5 = s[0] >> 3;
-    uint32_t y6 = s[0] >> 2;
+    uint32_t y5 = (uint32_t)(s[0] >> 3);
+    uint32_t y6 = (uint32_t)(s[0] >> 2);
     uint32_t rgb_565 = (y5 << 11) | (y6 << 5) | (y5 << 0);
     wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)rgb_565);
 
@@ -20926,7 +22666,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__y_16be(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr_565__y_16be(uint8_t* dst_ptr,
                                             size_t dst_len,
                                             uint8_t* dst_palette_ptr,
                                             size_t dst_palette_len,
@@ -20942,8 +22682,8 @@
   // TODO: unroll.
 
   while (n >= 1) {
-    uint32_t y5 = s[0] >> 3;
-    uint32_t y6 = s[0] >> 2;
+    uint32_t y5 = (uint32_t)(s[0] >> 3);
+    uint32_t y6 = (uint32_t)(s[0] >> 2);
     uint32_t rgb_565 = (y5 << 11) | (y6 << 5) | (y5 << 0);
     wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)rgb_565);
 
@@ -20956,7 +22696,94 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__index__src(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr_565__ya_nonpremul__src(uint8_t* dst_ptr,
+                                                       size_t dst_len,
+                                                       uint8_t* dst_palette_ptr,
+                                                       size_t dst_palette_len,
+                                                       const uint8_t* src_ptr,
+                                                       size_t src_len) {
+  size_t dst_len2 = dst_len / 2;
+  size_t src_len2 = src_len / 2;
+  size_t len = (dst_len2 < src_len2) ? dst_len2 : src_len2;
+  uint8_t* d = dst_ptr;
+  const uint8_t* s = src_ptr;
+  size_t n = len;
+
+  // TODO: unroll.
+
+  while (n >= 1) {
+    uint32_t s0 = ((uint32_t)(s[1]) << 24) | ((uint32_t)(s[0]) * 0x010101);
+
+    wuffs_base__poke_u16le__no_bounds_check(
+        d + (0 * 2),
+        wuffs_base__color_u32_argb_premul__as__color_u16_rgb_565(
+            wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(
+                s0)));
+
+    s += 1 * 2;
+    d += 1 * 2;
+    n -= 1;
+  }
+
+  return len;
+}
+
+static uint64_t  //
+wuffs_private_impl__swizzle_bgr_565__ya_nonpremul__src_over(
+    uint8_t* dst_ptr,
+    size_t dst_len,
+    uint8_t* dst_palette_ptr,
+    size_t dst_palette_len,
+    const uint8_t* src_ptr,
+    size_t src_len) {
+  size_t dst_len2 = dst_len / 2;
+  size_t src_len2 = src_len / 2;
+  size_t len = (dst_len2 < src_len2) ? dst_len2 : src_len2;
+  uint8_t* d = dst_ptr;
+  const uint8_t* s = src_ptr;
+  size_t n = len;
+
+  // TODO: unroll.
+
+  while (n >= 1) {
+    // Extract 16-bit color components.
+    uint32_t sa = 0x101 * ((uint32_t)s[1]);
+    uint32_t sy = 0x101 * ((uint32_t)s[0]);
+
+    // Convert from 565 color to 16-bit color.
+    uint32_t old_rgb_565 = wuffs_base__peek_u16le__no_bounds_check(d + (0 * 2));
+    uint32_t old_r5 = 0x1F & (old_rgb_565 >> 11);
+    uint32_t dr = (0x8421 * old_r5) >> 4;
+    uint32_t old_g6 = 0x3F & (old_rgb_565 >> 5);
+    uint32_t dg = (0x1041 * old_g6) >> 2;
+    uint32_t old_b5 = 0x1F & (old_rgb_565 >> 0);
+    uint32_t db = (0x8421 * old_b5) >> 4;
+
+    // Calculate the inverse of the src-alpha: how much of the dst to keep.
+    uint32_t ia = 0xFFFF - sa;
+
+    // Composite src (nonpremul) over dst (premul).
+    dr = ((sy * sa) + (dr * ia)) / 0xFFFF;
+    dg = ((sy * sa) + (dg * ia)) / 0xFFFF;
+    db = ((sy * sa) + (db * ia)) / 0xFFFF;
+
+    // Convert from 16-bit color to 565 color and combine the components.
+    uint32_t new_r5 = 0x1F & (dr >> 11);
+    uint32_t new_g6 = 0x3F & (dg >> 10);
+    uint32_t new_b5 = 0x1F & (db >> 11);
+    uint32_t new_rgb_565 = (new_r5 << 11) | (new_g6 << 5) | (new_b5 << 0);
+    wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)new_rgb_565);
+
+    s += 1 * 2;
+    d += 1 * 2;
+    n -= 1;
+  }
+
+  return len;
+}
+
+static uint64_t  //
+wuffs_private_impl__swizzle_bgr_565__index__src(uint8_t* dst_ptr,
                                                 size_t dst_len,
                                                 uint8_t* dst_palette_ptr,
                                                 size_t dst_palette_len,
@@ -21007,7 +22834,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__index_bgra_nonpremul__src_over(
+wuffs_private_impl__swizzle_bgr_565__index_bgra_nonpremul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21034,7 +22861,7 @@
     wuffs_base__poke_u16le__no_bounds_check(
         d + (0 * 2),
         wuffs_base__color_u32_argb_premul__as__color_u16_rgb_565(
-            wuffs_base__composite_premul_nonpremul_u32_axxx(d0, s0)));
+            wuffs_private_impl__composite_premul_nonpremul_u32_axxx(d0, s0)));
 
     s += 1 * 1;
     d += 1 * 2;
@@ -21045,7 +22872,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr_565__index_binary_alpha__src_over(
+wuffs_private_impl__swizzle_bgr_565__index_binary_alpha__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21082,7 +22909,7 @@
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__bgr_565(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr__bgr_565(uint8_t* dst_ptr,
                                          size_t dst_len,
                                          uint8_t* dst_palette_ptr,
                                          size_t dst_palette_len,
@@ -21111,7 +22938,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr__bgra_nonpremul__src(uint8_t* dst_ptr,
                                                      size_t dst_len,
                                                      uint8_t* dst_palette_ptr,
                                                      size_t dst_palette_len,
@@ -21141,7 +22968,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__bgra_nonpremul_4x16le__src(
+wuffs_private_impl__swizzle_bgr__bgra_nonpremul_4x16le__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21172,7 +22999,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src_over(
+wuffs_private_impl__swizzle_bgr__bgra_nonpremul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21220,7 +23047,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__bgra_nonpremul_4x16le__src_over(
+wuffs_private_impl__swizzle_bgr__bgra_nonpremul_4x16le__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21268,7 +23095,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__bgra_premul__src(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr__bgra_premul__src(uint8_t* dst_ptr,
                                                   size_t dst_len,
                                                   uint8_t* dst_palette_ptr,
                                                   size_t dst_palette_len,
@@ -21298,7 +23125,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__bgra_premul__src_over(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr__bgra_premul__src_over(uint8_t* dst_ptr,
                                                        size_t dst_len,
                                                        uint8_t* dst_palette_ptr,
                                                        size_t dst_palette_len,
@@ -21343,7 +23170,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr__rgba_nonpremul__src(uint8_t* dst_ptr,
                                                      size_t dst_len,
                                                      uint8_t* dst_palette_ptr,
                                                      size_t dst_palette_len,
@@ -21359,7 +23186,7 @@
   // TODO: unroll.
 
   while (n >= 1) {
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
+    uint32_t s0 = wuffs_private_impl__swap_u32_argb_abgr(
         wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(
             wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4))));
     wuffs_base__poke_u24le__no_bounds_check(d + (0 * 3), s0);
@@ -21373,7 +23200,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src(
+wuffs_private_impl__swizzle_bgr__rgba_nonpremul_4x16le__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21390,7 +23217,7 @@
   // TODO: unroll.
 
   while (n >= 1) {
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
+    uint32_t s0 = wuffs_private_impl__swap_u32_argb_abgr(
         wuffs_base__color_u64_argb_nonpremul__as__color_u32_argb_premul(
             wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8))));
     wuffs_base__poke_u24le__no_bounds_check(d + (0 * 3), s0);
@@ -21404,7 +23231,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src_over(
+wuffs_private_impl__swizzle_bgr__rgba_nonpremul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21452,7 +23279,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src_over(
+wuffs_private_impl__swizzle_bgr__rgba_nonpremul_4x16le__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21500,7 +23327,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__rgba_premul__src(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr__rgba_premul__src(uint8_t* dst_ptr,
                                                   size_t dst_len,
                                                   uint8_t* dst_palette_ptr,
                                                   size_t dst_palette_len,
@@ -21530,7 +23357,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__rgba_premul__src_over(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr__rgba_premul__src_over(uint8_t* dst_ptr,
                                                        size_t dst_len,
                                                        uint8_t* dst_palette_ptr,
                                                        size_t dst_palette_len,
@@ -21575,7 +23402,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgr__rgbx(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgr__rgbx(uint8_t* dst_ptr,
                                       size_t dst_len,
                                       uint8_t* dst_palette_ptr,
                                       size_t dst_palette_len,
@@ -21609,7 +23436,7 @@
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_nonpremul__src_over(
+wuffs_private_impl__swizzle_bgra_nonpremul__bgra_nonpremul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21628,7 +23455,7 @@
     uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4));
     wuffs_base__poke_u32le__no_bounds_check(
         d + (0 * 4),
-        wuffs_base__composite_nonpremul_nonpremul_u32_axxx(d0, s0));
+        wuffs_private_impl__composite_nonpremul_nonpremul_u32_axxx(d0, s0));
 
     s += 1 * 4;
     d += 1 * 4;
@@ -21639,7 +23466,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_nonpremul_4x16le__src(
+wuffs_private_impl__swizzle_bgra_nonpremul__bgra_nonpremul_4x16le__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21666,7 +23493,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_nonpremul_4x16le__src_over(
+wuffs_private_impl__swizzle_bgra_nonpremul__bgra_nonpremul_4x16le__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21687,7 +23514,8 @@
     wuffs_base__poke_u32le__no_bounds_check(
         d + (0 * 4),
         wuffs_base__color_u64__as__color_u32(
-            wuffs_base__composite_nonpremul_nonpremul_u64_axxx(d0, s0)));
+            wuffs_private_impl__composite_nonpremul_nonpremul_u64_axxx(d0,
+                                                                       s0)));
 
     s += 1 * 8;
     d += 1 * 4;
@@ -21698,7 +23526,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_premul__src(
+wuffs_private_impl__swizzle_bgra_nonpremul__bgra_premul__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21727,7 +23555,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_premul__src_over(
+wuffs_private_impl__swizzle_bgra_nonpremul__bgra_premul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21745,7 +23573,8 @@
     uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
     uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4));
     wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__composite_nonpremul_premul_u32_axxx(d0, s0));
+        d + (0 * 4),
+        wuffs_private_impl__composite_nonpremul_premul_u32_axxx(d0, s0));
 
     s += 1 * 4;
     d += 1 * 4;
@@ -21756,7 +23585,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__index_bgra_nonpremul__src_over(
+wuffs_private_impl__swizzle_bgra_nonpremul__index_bgra_nonpremul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21781,7 +23610,7 @@
                                                           ((size_t)s[0] * 4));
     wuffs_base__poke_u32le__no_bounds_check(
         d + (0 * 4),
-        wuffs_base__composite_nonpremul_nonpremul_u32_axxx(d0, s0));
+        wuffs_private_impl__composite_nonpremul_nonpremul_u32_axxx(d0, s0));
 
     s += 1 * 1;
     d += 1 * 4;
@@ -21792,7 +23621,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_nonpremul__src_over(
+wuffs_private_impl__swizzle_bgra_nonpremul__rgba_nonpremul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21808,11 +23637,11 @@
 
   while (n >= 1) {
     uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
+    uint32_t s0 = wuffs_private_impl__swap_u32_argb_abgr(
         wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
     wuffs_base__poke_u32le__no_bounds_check(
         d + (0 * 4),
-        wuffs_base__composite_nonpremul_nonpremul_u32_axxx(d0, s0));
+        wuffs_private_impl__composite_nonpremul_nonpremul_u32_axxx(d0, s0));
 
     s += 1 * 4;
     d += 1 * 4;
@@ -21823,7 +23652,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_premul__src(
+wuffs_private_impl__swizzle_bgra_nonpremul__rgba_premul__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21838,7 +23667,7 @@
   size_t n = len;
 
   while (n >= 1) {
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
+    uint32_t s0 = wuffs_private_impl__swap_u32_argb_abgr(
         wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
     wuffs_base__poke_u32le__no_bounds_check(
         d + (0 * 4),
@@ -21853,7 +23682,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_premul__src_over(
+wuffs_private_impl__swizzle_bgra_nonpremul__rgba_premul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21869,10 +23698,11 @@
 
   while (n >= 1) {
     uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
+    uint32_t s0 = wuffs_private_impl__swap_u32_argb_abgr(
         wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
     wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__composite_nonpremul_premul_u32_axxx(d0, s0));
+        d + (0 * 4),
+        wuffs_private_impl__composite_nonpremul_premul_u32_axxx(d0, s0));
 
     s += 1 * 4;
     d += 1 * 4;
@@ -21882,10 +23712,71 @@
   return len;
 }
 
+static uint64_t  //
+wuffs_private_impl__swizzle_bgra_nonpremul__ya_nonpremul__src(
+    uint8_t* dst_ptr,
+    size_t dst_len,
+    uint8_t* dst_palette_ptr,
+    size_t dst_palette_len,
+    const uint8_t* src_ptr,
+    size_t src_len) {
+  size_t dst_len4 = dst_len / 4;
+  size_t src_len2 = src_len / 2;
+  size_t len = (dst_len4 < src_len2) ? dst_len4 : src_len2;
+  uint8_t* d = dst_ptr;
+  const uint8_t* s = src_ptr;
+  size_t n = len;
+
+  // TODO: unroll.
+
+  while (n >= 1) {
+    uint32_t s0 = ((uint32_t)(s[1]) << 24) | ((uint32_t)(s[0]) * 0x010101);
+    wuffs_base__poke_u32le__no_bounds_check(d + (0 * 4), s0);
+
+    s += 1 * 2;
+    d += 1 * 4;
+    n -= 1;
+  }
+
+  return len;
+}
+
+static uint64_t  //
+wuffs_private_impl__swizzle_bgra_nonpremul__ya_nonpremul__src_over(
+    uint8_t* dst_ptr,
+    size_t dst_len,
+    uint8_t* dst_palette_ptr,
+    size_t dst_palette_len,
+    const uint8_t* src_ptr,
+    size_t src_len) {
+  size_t dst_len4 = dst_len / 4;
+  size_t src_len2 = src_len / 2;
+  size_t len = (dst_len4 < src_len2) ? dst_len4 : src_len2;
+  uint8_t* d = dst_ptr;
+  const uint8_t* s = src_ptr;
+  size_t n = len;
+
+  // TODO: unroll.
+
+  while (n >= 1) {
+    uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
+    uint32_t s0 = ((uint32_t)(s[1]) << 24) | ((uint32_t)(s[0]) * 0x010101);
+    wuffs_base__poke_u32le__no_bounds_check(
+        d + (0 * 4),
+        wuffs_private_impl__composite_nonpremul_nonpremul_u32_axxx(d0, s0));
+
+    s += 1 * 2;
+    d += 1 * 4;
+    n -= 1;
+  }
+
+  return len;
+}
+
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_nonpremul__src(
+wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__bgra_nonpremul__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21921,7 +23812,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_nonpremul__src_over(
+wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__bgra_nonpremul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21941,7 +23832,7 @@
         wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
     wuffs_base__poke_u64le__no_bounds_check(
         d + (0 * 8),
-        wuffs_base__composite_nonpremul_nonpremul_u64_axxx(d0, s0));
+        wuffs_private_impl__composite_nonpremul_nonpremul_u64_axxx(d0, s0));
 
     s += 1 * 4;
     d += 1 * 8;
@@ -21951,7 +23842,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_nonpremul_4x16le__src_over(
+wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__bgra_nonpremul_4x16le__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -21970,7 +23861,7 @@
     uint64_t s0 = wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8));
     wuffs_base__poke_u64le__no_bounds_check(
         d + (0 * 8),
-        wuffs_base__composite_nonpremul_nonpremul_u64_axxx(d0, s0));
+        wuffs_private_impl__composite_nonpremul_nonpremul_u64_axxx(d0, s0));
 
     s += 1 * 8;
     d += 1 * 8;
@@ -21980,7 +23871,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_premul__src(
+wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__bgra_premul__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22008,7 +23899,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_premul__src_over(
+wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__bgra_premul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22027,7 +23918,8 @@
     uint64_t s0 = wuffs_base__color_u32__as__color_u64(
         wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
     wuffs_base__poke_u64le__no_bounds_check(
-        d + (0 * 8), wuffs_base__composite_nonpremul_premul_u64_axxx(d0, s0));
+        d + (0 * 8),
+        wuffs_private_impl__composite_nonpremul_premul_u64_axxx(d0, s0));
 
     s += 1 * 4;
     d += 1 * 8;
@@ -22037,7 +23929,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__index_bgra_nonpremul__src_over(
+wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__index_bgra_nonpremul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22061,7 +23953,7 @@
                                                 ((size_t)s[0] * 4)));
     wuffs_base__poke_u64le__no_bounds_check(
         d + (0 * 8),
-        wuffs_base__composite_nonpremul_nonpremul_u64_axxx(d0, s0));
+        wuffs_private_impl__composite_nonpremul_nonpremul_u64_axxx(d0, s0));
 
     s += 1 * 1;
     d += 1 * 8;
@@ -22072,7 +23964,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_nonpremul__src(
+wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__rgba_nonpremul__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22108,7 +24000,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_nonpremul__src_over(
+wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__rgba_nonpremul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22124,12 +24016,12 @@
   size_t n = len;
   while (n >= 1) {
     uint64_t d0 = wuffs_base__peek_u64le__no_bounds_check(d + (0 * 8));
-    uint64_t s0 =
-        wuffs_base__color_u32__as__color_u64(wuffs_base__swap_u32_argb_abgr(
+    uint64_t s0 = wuffs_base__color_u32__as__color_u64(
+        wuffs_private_impl__swap_u32_argb_abgr(
             wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4))));
     wuffs_base__poke_u64le__no_bounds_check(
         d + (0 * 8),
-        wuffs_base__composite_nonpremul_nonpremul_u64_axxx(d0, s0));
+        wuffs_private_impl__composite_nonpremul_nonpremul_u64_axxx(d0, s0));
 
     s += 1 * 4;
     d += 1 * 8;
@@ -22139,7 +24031,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_premul__src(
+wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__rgba_premul__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22156,7 +24048,7 @@
   while (n >= 1) {
     uint64_t s0 = wuffs_base__color_u32__as__color_u64(
         wuffs_base__color_u32_argb_premul__as__color_u32_argb_nonpremul(
-            wuffs_base__swap_u32_argb_abgr(
+            wuffs_private_impl__swap_u32_argb_abgr(
                 wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)))));
     wuffs_base__poke_u64le__no_bounds_check(d + (0 * 8), s0);
 
@@ -22168,7 +24060,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_premul__src_over(
+wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__rgba_premul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22184,11 +24076,12 @@
   size_t n = len;
   while (n >= 1) {
     uint64_t d0 = wuffs_base__peek_u64le__no_bounds_check(d + (0 * 8));
-    uint64_t s0 =
-        wuffs_base__color_u32__as__color_u64(wuffs_base__swap_u32_argb_abgr(
+    uint64_t s0 = wuffs_base__color_u32__as__color_u64(
+        wuffs_private_impl__swap_u32_argb_abgr(
             wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4))));
     wuffs_base__poke_u64le__no_bounds_check(
-        d + (0 * 8), wuffs_base__composite_nonpremul_premul_u64_axxx(d0, s0));
+        d + (0 * 8),
+        wuffs_private_impl__composite_nonpremul_premul_u64_axxx(d0, s0));
 
     s += 1 * 4;
     d += 1 * 8;
@@ -22197,10 +24090,67 @@
   return len;
 }
 
+static uint64_t  //
+wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__ya_nonpremul__src(
+    uint8_t* dst_ptr,
+    size_t dst_len,
+    uint8_t* dst_palette_ptr,
+    size_t dst_palette_len,
+    const uint8_t* src_ptr,
+    size_t src_len) {
+  size_t dst_len8 = dst_len / 8;
+  size_t src_len2 = src_len / 2;
+  size_t len = (dst_len8 < src_len2) ? dst_len8 : src_len2;
+  uint8_t* d = dst_ptr;
+  const uint8_t* s = src_ptr;
+
+  size_t n = len;
+  while (n >= 1) {
+    uint64_t s0 = ((uint64_t)(s[1]) * 0x0101000000000000) |
+                  ((uint64_t)(s[0]) * 0x0000010101010101);
+    wuffs_base__poke_u64le__no_bounds_check(d + (0 * 8), s0);
+
+    s += 1 * 2;
+    d += 1 * 8;
+    n -= 1;
+  }
+  return len;
+}
+
+static uint64_t  //
+wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__ya_nonpremul__src_over(
+    uint8_t* dst_ptr,
+    size_t dst_len,
+    uint8_t* dst_palette_ptr,
+    size_t dst_palette_len,
+    const uint8_t* src_ptr,
+    size_t src_len) {
+  size_t dst_len8 = dst_len / 8;
+  size_t src_len2 = src_len / 2;
+  size_t len = (dst_len8 < src_len2) ? dst_len8 : src_len2;
+  uint8_t* d = dst_ptr;
+  const uint8_t* s = src_ptr;
+
+  size_t n = len;
+  while (n >= 1) {
+    uint64_t d0 = wuffs_base__peek_u64le__no_bounds_check(d + (0 * 8));
+    uint64_t s0 = ((uint64_t)(s[1]) * 0x0101000000000000) |
+                  ((uint64_t)(s[0]) * 0x0000010101010101);
+    wuffs_base__poke_u64le__no_bounds_check(
+        d + (0 * 8),
+        wuffs_private_impl__composite_nonpremul_nonpremul_u64_axxx(d0, s0));
+
+    s += 1 * 2;
+    d += 1 * 8;
+    n -= 1;
+  }
+  return len;
+}
+
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src(
+wuffs_private_impl__swizzle_bgra_premul__bgra_nonpremul__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22231,7 +24181,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul_4x16le__src(
+wuffs_private_impl__swizzle_bgra_premul__bgra_nonpremul_4x16le__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22262,7 +24212,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src_over(
+wuffs_private_impl__swizzle_bgra_premul__bgra_nonpremul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22282,7 +24232,8 @@
     uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
     uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4));
     wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__composite_premul_nonpremul_u32_axxx(d0, s0));
+        d + (0 * 4),
+        wuffs_private_impl__composite_premul_nonpremul_u32_axxx(d0, s0));
 
     s += 1 * 4;
     d += 1 * 4;
@@ -22293,7 +24244,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul_4x16le__src_over(
+wuffs_private_impl__swizzle_bgra_premul__bgra_nonpremul_4x16le__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22316,7 +24267,7 @@
     wuffs_base__poke_u32le__no_bounds_check(
         d + (0 * 4),
         wuffs_base__color_u64__as__color_u32(
-            wuffs_base__composite_premul_nonpremul_u64_axxx(d0, s0)));
+            wuffs_private_impl__composite_premul_nonpremul_u64_axxx(d0, s0)));
 
     s += 1 * 8;
     d += 1 * 4;
@@ -22327,7 +24278,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__bgra_premul__src_over(
+wuffs_private_impl__swizzle_bgra_premul__bgra_premul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22347,7 +24298,8 @@
     uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
     uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4));
     wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__composite_premul_premul_u32_axxx(d0, s0));
+        d + (0 * 4),
+        wuffs_private_impl__composite_premul_premul_u32_axxx(d0, s0));
 
     s += 1 * 4;
     d += 1 * 4;
@@ -22358,7 +24310,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__index_bgra_nonpremul__src_over(
+wuffs_private_impl__swizzle_bgra_premul__index_bgra_nonpremul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22382,7 +24334,8 @@
     uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
                                                           ((size_t)s[0] * 4));
     wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__composite_premul_nonpremul_u32_axxx(d0, s0));
+        d + (0 * 4),
+        wuffs_private_impl__composite_premul_nonpremul_u32_axxx(d0, s0));
 
     s += 1 * 1;
     d += 1 * 4;
@@ -22393,7 +24346,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src(
+wuffs_private_impl__swizzle_bgra_premul__rgba_nonpremul__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22410,7 +24363,7 @@
   // TODO: unroll.
 
   while (n >= 1) {
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
+    uint32_t s0 = wuffs_private_impl__swap_u32_argb_abgr(
         wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
     wuffs_base__poke_u32le__no_bounds_check(
         d + (0 * 4),
@@ -22425,7 +24378,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src_over(
+wuffs_private_impl__swizzle_bgra_premul__rgba_nonpremul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22443,10 +24396,11 @@
 
   while (n >= 1) {
     uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
+    uint32_t s0 = wuffs_private_impl__swap_u32_argb_abgr(
         wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
     wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__composite_premul_nonpremul_u32_axxx(d0, s0));
+        d + (0 * 4),
+        wuffs_private_impl__composite_premul_nonpremul_u32_axxx(d0, s0));
 
     s += 1 * 4;
     d += 1 * 4;
@@ -22457,7 +24411,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul_4x16le__src(
+wuffs_private_impl__swizzle_bgra_premul__rgba_nonpremul_4x16le__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22477,7 +24431,7 @@
     uint64_t s0 = wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8));
     wuffs_base__poke_u32le__no_bounds_check(
         d + (0 * 4),
-        wuffs_base__swap_u32_argb_abgr(
+        wuffs_private_impl__swap_u32_argb_abgr(
             wuffs_base__color_u64_argb_nonpremul__as__color_u32_argb_premul(
                 s0)));
 
@@ -22490,7 +24444,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul_4x16le__src_over(
+wuffs_private_impl__swizzle_bgra_premul__rgba_nonpremul_4x16le__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22509,12 +24463,12 @@
   while (n >= 1) {
     uint64_t d0 = wuffs_base__color_u32__as__color_u64(
         wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4)));
-    uint64_t s0 = wuffs_base__swap_u64_argb_abgr(
+    uint64_t s0 = wuffs_private_impl__swap_u64_argb_abgr(
         wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8)));
     wuffs_base__poke_u32le__no_bounds_check(
         d + (0 * 4),
         wuffs_base__color_u64__as__color_u32(
-            wuffs_base__composite_premul_nonpremul_u64_axxx(d0, s0)));
+            wuffs_private_impl__composite_premul_nonpremul_u64_axxx(d0, s0)));
 
     s += 1 * 8;
     d += 1 * 4;
@@ -22525,7 +24479,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgra_premul__rgba_premul__src_over(
+wuffs_private_impl__swizzle_bgra_premul__rgba_premul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22541,10 +24495,11 @@
 
   while (n >= 1) {
     uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
-    uint32_t s0 = wuffs_base__swap_u32_argb_abgr(
+    uint32_t s0 = wuffs_private_impl__swap_u32_argb_abgr(
         wuffs_base__peek_u32le__no_bounds_check(s + (0 * 4)));
     wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__composite_premul_premul_u32_axxx(d0, s0));
+        d + (0 * 4),
+        wuffs_private_impl__composite_premul_premul_u32_axxx(d0, s0));
 
     s += 1 * 4;
     d += 1 * 4;
@@ -22554,10 +24509,73 @@
   return len;
 }
 
+static uint64_t  //
+wuffs_private_impl__swizzle_bgra_premul__ya_nonpremul__src(
+    uint8_t* dst_ptr,
+    size_t dst_len,
+    uint8_t* dst_palette_ptr,
+    size_t dst_palette_len,
+    const uint8_t* src_ptr,
+    size_t src_len) {
+  size_t dst_len4 = dst_len / 4;
+  size_t src_len2 = src_len / 2;
+  size_t len = (dst_len4 < src_len2) ? dst_len4 : src_len2;
+  uint8_t* d = dst_ptr;
+  const uint8_t* s = src_ptr;
+  size_t n = len;
+
+  // TODO: unroll.
+
+  while (n >= 1) {
+    uint32_t s0 = ((uint32_t)(s[1]) << 24) | ((uint32_t)(s[0]) * 0x010101);
+    wuffs_base__poke_u32le__no_bounds_check(
+        d + (0 * 4),
+        wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(s0));
+
+    s += 1 * 2;
+    d += 1 * 4;
+    n -= 1;
+  }
+
+  return len;
+}
+
+static uint64_t  //
+wuffs_private_impl__swizzle_bgra_premul__ya_nonpremul__src_over(
+    uint8_t* dst_ptr,
+    size_t dst_len,
+    uint8_t* dst_palette_ptr,
+    size_t dst_palette_len,
+    const uint8_t* src_ptr,
+    size_t src_len) {
+  size_t dst_len4 = dst_len / 4;
+  size_t src_len2 = src_len / 2;
+  size_t len = (dst_len4 < src_len2) ? dst_len4 : src_len2;
+  uint8_t* d = dst_ptr;
+  const uint8_t* s = src_ptr;
+  size_t n = len;
+
+  // TODO: unroll.
+
+  while (n >= 1) {
+    uint32_t d0 = wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4));
+    uint32_t s0 = ((uint32_t)(s[1]) << 24) | ((uint32_t)(s[0]) * 0x010101);
+    wuffs_base__poke_u32le__no_bounds_check(
+        d + (0 * 4),
+        wuffs_private_impl__composite_premul_nonpremul_u32_axxx(d0, s0));
+
+    s += 1 * 2;
+    d += 1 * 4;
+    n -= 1;
+  }
+
+  return len;
+}
+
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw__bgr(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgrw__bgr(uint8_t* dst_ptr,
                                       size_t dst_len,
                                       uint8_t* dst_palette_ptr,
                                       size_t dst_palette_len,
@@ -22586,7 +24604,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw__bgr_565(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgrw__bgr_565(uint8_t* dst_ptr,
                                           size_t dst_len,
                                           uint8_t* dst_palette_ptr,
                                           size_t dst_palette_len,
@@ -22615,7 +24633,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw__bgrx(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgrw__bgrx(uint8_t* dst_ptr,
                                        size_t dst_len,
                                        uint8_t* dst_palette_ptr,
                                        size_t dst_palette_len,
@@ -22647,7 +24665,60 @@
 #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
 WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgrw__bgr__x86_sse42(uint8_t* dst_ptr,
+                                                 size_t dst_len,
+                                                 uint8_t* dst_palette_ptr,
+                                                 size_t dst_palette_len,
+                                                 const uint8_t* src_ptr,
+                                                 size_t src_len) {
+  size_t dst_len4 = dst_len / 4;
+  size_t src_len3 = src_len / 3;
+  size_t len = (dst_len4 < src_len3) ? dst_len4 : src_len3;
+  uint8_t* d = dst_ptr;
+  const uint8_t* s = src_ptr;
+  size_t n = len;
+
+  __m128i shuffle = _mm_set_epi8(+0x00, +0x0B, +0x0A, +0x09,  //
+                                 +0x00, +0x08, +0x07, +0x06,  //
+                                 +0x00, +0x05, +0x04, +0x03,  //
+                                 +0x00, +0x02, +0x01, +0x00);
+  __m128i or_ff = _mm_set_epi8(-0x01, +0x00, +0x00, +0x00,  //
+                               -0x01, +0x00, +0x00, +0x00,  //
+                               -0x01, +0x00, +0x00, +0x00,  //
+                               -0x01, +0x00, +0x00, +0x00);
+
+  while (n >= 6) {
+    __m128i x;
+    x = _mm_lddqu_si128((const __m128i*)(const void*)s);
+    x = _mm_shuffle_epi8(x, shuffle);
+    x = _mm_or_si128(x, or_ff);
+    _mm_storeu_si128((__m128i*)(void*)d, x);
+
+    s += 4 * 3;
+    d += 4 * 4;
+    n -= 4;
+  }
+
+  while (n >= 1) {
+    uint8_t b0 = s[0];
+    uint8_t b1 = s[1];
+    uint8_t b2 = s[2];
+    d[0] = b0;
+    d[1] = b1;
+    d[2] = b2;
+    d[3] = 0xFF;
+
+    s += 1 * 3;
+    d += 1 * 4;
+    n -= 1;
+  }
+
+  return len;
+}
+
+WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
+static uint64_t  //
+wuffs_private_impl__swizzle_bgrw__rgb__x86_sse42(uint8_t* dst_ptr,
                                                  size_t dst_len,
                                                  uint8_t* dst_palette_ptr,
                                                  size_t dst_palette_len,
@@ -22701,7 +24772,7 @@
 // ‼ WUFFS MULTI-FILE SECTION -x86_sse42
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw__rgb(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgrw__rgb(uint8_t* dst_ptr,
                                       size_t dst_len,
                                       uint8_t* dst_palette_ptr,
                                       size_t dst_palette_len,
@@ -22732,7 +24803,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw__rgbx(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgrw__rgbx(uint8_t* dst_ptr,
                                        size_t dst_len,
                                        uint8_t* dst_palette_ptr,
                                        size_t dst_palette_len,
@@ -22767,7 +24838,7 @@
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw_4x16le__bgr(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgrw_4x16le__bgr(uint8_t* dst_ptr,
                                              size_t dst_len,
                                              uint8_t* dst_palette_ptr,
                                              size_t dst_palette_len,
@@ -22802,7 +24873,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw_4x16le__bgr_565(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgrw_4x16le__bgr_565(uint8_t* dst_ptr,
                                                  size_t dst_len,
                                                  uint8_t* dst_palette_ptr,
                                                  size_t dst_palette_len,
@@ -22831,7 +24902,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw_4x16le__bgrx(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgrw_4x16le__bgrx(uint8_t* dst_ptr,
                                               size_t dst_len,
                                               uint8_t* dst_palette_ptr,
                                               size_t dst_palette_len,
@@ -22866,7 +24937,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__bgrw_4x16le__rgb(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_bgrw_4x16le__rgb(uint8_t* dst_ptr,
                                              size_t dst_len,
                                              uint8_t* dst_palette_ptr,
                                              size_t dst_palette_len,
@@ -22903,7 +24974,7 @@
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__rgb__bgr_565(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_rgb__bgr_565(uint8_t* dst_ptr,
                                          size_t dst_len,
                                          uint8_t* dst_palette_ptr,
                                          size_t dst_palette_len,
@@ -22921,7 +24992,7 @@
   while (n >= 1) {
     wuffs_base__poke_u24le__no_bounds_check(
         d + (0 * 3),
-        wuffs_base__swap_u32_argb_abgr(
+        wuffs_private_impl__swap_u32_argb_abgr(
             wuffs_base__color_u16_rgb_565__as__color_u32_argb_premul(
                 wuffs_base__peek_u16le__no_bounds_check(s + (0 * 2)))));
 
@@ -22936,7 +25007,7 @@
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__rgba_nonpremul__bgra_nonpremul_4x16le__src(
+wuffs_private_impl__swizzle_rgba_nonpremul__bgra_nonpremul_4x16le__src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22952,8 +25023,9 @@
   size_t n = len;
   while (n >= 1) {
     wuffs_base__poke_u32le__no_bounds_check(
-        d + (0 * 4), wuffs_base__color_u64__as__color_u32__swap_u32_argb_abgr(
-                         wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8))));
+        d + (0 * 4),
+        wuffs_private_impl__color_u64__as__color_u32__swap_u32_argb_abgr(
+            wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8))));
 
     s += 1 * 8;
     d += 1 * 4;
@@ -22963,7 +25035,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__rgba_nonpremul__bgra_nonpremul_4x16le__src_over(
+wuffs_private_impl__swizzle_rgba_nonpremul__bgra_nonpremul_4x16le__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -22980,12 +25052,13 @@
   while (n >= 1) {
     uint64_t d0 = wuffs_base__color_u32__as__color_u64(
         wuffs_base__peek_u32le__no_bounds_check(d + (0 * 4)));
-    uint64_t s0 = wuffs_base__swap_u64_argb_abgr(
+    uint64_t s0 = wuffs_private_impl__swap_u64_argb_abgr(
         wuffs_base__peek_u64le__no_bounds_check(s + (0 * 8)));
     wuffs_base__poke_u32le__no_bounds_check(
         d + (0 * 4),
         wuffs_base__color_u64__as__color_u32(
-            wuffs_base__composite_nonpremul_nonpremul_u64_axxx(d0, s0)));
+            wuffs_private_impl__composite_nonpremul_nonpremul_u64_axxx(d0,
+                                                                       s0)));
 
     s += 1 * 8;
     d += 1 * 4;
@@ -22998,7 +25071,7 @@
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__rgbw__bgr_565(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_rgbw__bgr_565(uint8_t* dst_ptr,
                                           size_t dst_len,
                                           uint8_t* dst_palette_ptr,
                                           size_t dst_palette_len,
@@ -23016,7 +25089,7 @@
   while (n >= 1) {
     wuffs_base__poke_u32le__no_bounds_check(
         d + (0 * 4),
-        wuffs_base__swap_u32_argb_abgr(
+        wuffs_private_impl__swap_u32_argb_abgr(
             wuffs_base__color_u16_rgb_565__as__color_u32_argb_premul(
                 wuffs_base__peek_u16le__no_bounds_check(s + (0 * 2)))));
 
@@ -23031,7 +25104,7 @@
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxx__index__src(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_xxx__index__src(uint8_t* dst_ptr,
                                             size_t dst_len,
                                             uint8_t* dst_palette_ptr,
                                             size_t dst_palette_len,
@@ -23089,7 +25162,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxx__index_bgra_nonpremul__src_over(
+wuffs_private_impl__swizzle_xxx__index_bgra_nonpremul__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -23114,7 +25187,8 @@
     uint32_t s0 = wuffs_base__peek_u32le__no_bounds_check(dst_palette_ptr +
                                                           ((size_t)s[0] * 4));
     wuffs_base__poke_u24le__no_bounds_check(
-        d + (0 * 3), wuffs_base__composite_premul_nonpremul_u32_axxx(d0, s0));
+        d + (0 * 3),
+        wuffs_private_impl__composite_premul_nonpremul_u32_axxx(d0, s0));
 
     s += 1 * 1;
     d += 1 * 3;
@@ -23125,7 +25199,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over(
+wuffs_private_impl__swizzle_xxx__index_binary_alpha__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -23187,7 +25261,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxx__xxxx(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_xxx__xxxx(uint8_t* dst_ptr,
                                       size_t dst_len,
                                       uint8_t* dst_palette_ptr,
                                       size_t dst_palette_len,
@@ -23215,7 +25289,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxx__y(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_xxx__y(uint8_t* dst_ptr,
                                    size_t dst_len,
                                    uint8_t* dst_palette_ptr,
                                    size_t dst_palette_len,
@@ -23244,7 +25318,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxx__y_16be(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_xxx__y_16be(uint8_t* dst_ptr,
                                         size_t dst_len,
                                         uint8_t* dst_palette_ptr,
                                         size_t dst_palette_len,
@@ -23273,10 +25347,73 @@
   return len;
 }
 
+static uint64_t  //
+wuffs_private_impl__swizzle_xxx__ya_nonpremul__src(uint8_t* dst_ptr,
+                                                   size_t dst_len,
+                                                   uint8_t* dst_palette_ptr,
+                                                   size_t dst_palette_len,
+                                                   const uint8_t* src_ptr,
+                                                   size_t src_len) {
+  size_t dst_len3 = dst_len / 3;
+  size_t src_len2 = src_len / 2;
+  size_t len = (dst_len3 < src_len2) ? dst_len3 : src_len2;
+  uint8_t* d = dst_ptr;
+  const uint8_t* s = src_ptr;
+  size_t n = len;
+
+  // TODO: unroll.
+
+  while (n >= 1) {
+    uint32_t s0 = ((uint32_t)(s[1]) << 24) | ((uint32_t)(s[0]) * 0x010101);
+    wuffs_base__poke_u24le__no_bounds_check(
+        d + (0 * 3),
+        wuffs_base__color_u32_argb_nonpremul__as__color_u32_argb_premul(s0));
+
+    s += 1 * 2;
+    d += 1 * 3;
+    n -= 1;
+  }
+
+  return len;
+}
+
+static uint64_t  //
+wuffs_private_impl__swizzle_xxx__ya_nonpremul__src_over(
+    uint8_t* dst_ptr,
+    size_t dst_len,
+    uint8_t* dst_palette_ptr,
+    size_t dst_palette_len,
+    const uint8_t* src_ptr,
+    size_t src_len) {
+  size_t dst_len3 = dst_len / 3;
+  size_t src_len2 = src_len / 2;
+  size_t len = (dst_len3 < src_len2) ? dst_len3 : src_len2;
+  uint8_t* d = dst_ptr;
+  const uint8_t* s = src_ptr;
+  size_t n = len;
+
+  // TODO: unroll.
+
+  while (n >= 1) {
+    uint32_t d0 =
+        wuffs_base__peek_u24le__no_bounds_check(d + (0 * 3)) | 0xFF000000;
+    uint32_t s0 = ((uint32_t)(s[1]) << 24) | ((uint32_t)(s[0]) * 0x010101);
+    wuffs_base__poke_u24le__no_bounds_check(
+        d + (0 * 3),
+        wuffs_private_impl__composite_premul_nonpremul_u32_axxx(d0, s0));
+
+    s += 1 * 2;
+    d += 1 * 3;
+    n -= 1;
+  }
+
+  return len;
+}
+
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxxx__index__src(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_xxxx__index__src(uint8_t* dst_ptr,
                                              size_t dst_len,
                                              uint8_t* dst_palette_ptr,
                                              size_t dst_palette_len,
@@ -23327,7 +25464,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over(
+wuffs_private_impl__swizzle_xxxx__index_binary_alpha__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -23392,7 +25529,7 @@
 #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
 WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2")
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxxx__y__x86_sse42(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_xxxx__y__x86_sse42(uint8_t* dst_ptr,
                                                size_t dst_len,
                                                uint8_t* dst_palette_ptr,
                                                size_t dst_palette_len,
@@ -23440,7 +25577,7 @@
 // ‼ WUFFS MULTI-FILE SECTION -x86_sse42
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxxx__y(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_xxxx__y(uint8_t* dst_ptr,
                                     size_t dst_len,
                                     uint8_t* dst_palette_ptr,
                                     size_t dst_palette_len,
@@ -23465,7 +25602,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxxx__y_16be(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_xxxx__y_16be(uint8_t* dst_ptr,
                                          size_t dst_len,
                                          uint8_t* dst_palette_ptr,
                                          size_t dst_palette_len,
@@ -23493,7 +25630,7 @@
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxxxxxxx__index__src(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_xxxxxxxx__index__src(uint8_t* dst_ptr,
                                                  size_t dst_len,
                                                  uint8_t* dst_palette_ptr,
                                                  size_t dst_palette_len,
@@ -23524,7 +25661,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxxxxxxx__index_binary_alpha__src_over(
+wuffs_private_impl__swizzle_xxxxxxxx__index_binary_alpha__src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -23558,7 +25695,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxxxxxxx__y(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_xxxxxxxx__y(uint8_t* dst_ptr,
                                         size_t dst_len,
                                         uint8_t* dst_palette_ptr,
                                         size_t dst_palette_len,
@@ -23583,7 +25720,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__xxxxxxxx__y_16be(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_xxxxxxxx__y_16be(uint8_t* dst_ptr,
                                              size_t dst_len,
                                              uint8_t* dst_palette_ptr,
                                              size_t dst_palette_len,
@@ -23613,7 +25750,7 @@
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__y__y_16be(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_y__y_16be(uint8_t* dst_ptr,
                                       size_t dst_len,
                                       uint8_t* dst_palette_ptr,
                                       size_t dst_palette_len,
@@ -23637,7 +25774,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__y_16le__y_16be(uint8_t* dst_ptr,
+wuffs_private_impl__swizzle_y_16le__y_16be(uint8_t* dst_ptr,
                                            size_t dst_len,
                                            uint8_t* dst_palette_ptr,
                                            size_t dst_palette_len,
@@ -23667,7 +25804,39 @@
 // --------
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__transparent_black_src(
+wuffs_private_impl__swizzle_ya_nonpremul__ya_nonpremul__src_over(
+    uint8_t* dst_ptr,
+    size_t dst_len,
+    uint8_t* dst_palette_ptr,
+    size_t dst_palette_len,
+    const uint8_t* src_ptr,
+    size_t src_len) {
+  size_t dst_len2 = dst_len / 2;
+  size_t src_len2 = src_len / 2;
+  size_t len = (dst_len2 < src_len2) ? dst_len2 : src_len2;
+  uint8_t* d = dst_ptr;
+  const uint8_t* s = src_ptr;
+  size_t n = len;
+
+  while (n >= 1) {
+    uint32_t d0 = ((uint32_t)(d[1]) << 24) | ((uint32_t)(d[0]) * 0x010101);
+    uint32_t s0 = ((uint32_t)(s[1]) << 24) | ((uint32_t)(s[0]) * 0x010101);
+    uint32_t c0 =
+        wuffs_private_impl__composite_nonpremul_nonpremul_u32_axxx(d0, s0);
+    wuffs_base__poke_u16le__no_bounds_check(d + (0 * 2), (uint16_t)(c0 >> 16));
+
+    s += 1 * 2;
+    d += 1 * 2;
+    n -= 1;
+  }
+
+  return len;
+}
+
+// --------
+
+static uint64_t  //
+wuffs_private_impl__swizzle_transparent_black_src(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -23683,7 +25852,7 @@
 }
 
 static uint64_t  //
-wuffs_base__pixel_swizzler__transparent_black_src_over(
+wuffs_private_impl__swizzle_transparent_black_src_over(
     uint8_t* dst_ptr,
     size_t dst_len,
     uint8_t* dst_palette_ptr,
@@ -23699,22 +25868,23 @@
 
 // --------
 
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__y(wuffs_base__pixel_swizzler* p,
-                                       wuffs_base__pixel_format dst_pixfmt,
-                                       wuffs_base__slice_u8 dst_palette,
-                                       wuffs_base__slice_u8 src_palette,
-                                       wuffs_base__pixel_blend blend) {
+static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func  //
+wuffs_private_impl__pixel_swizzler__prepare__y(
+    wuffs_base__pixel_swizzler* p,
+    wuffs_base__pixel_format dst_pixfmt,
+    wuffs_base__slice_u8 dst_palette,
+    wuffs_base__slice_u8 src_palette,
+    wuffs_base__pixel_blend blend) {
   switch (dst_pixfmt.repr) {
     case WUFFS_BASE__PIXEL_FORMAT__Y:
-      return wuffs_base__pixel_swizzler__copy_1_1;
+      return wuffs_private_impl__swizzle_copy_1_1;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      return wuffs_base__pixel_swizzler__bgr_565__y;
+      return wuffs_private_impl__swizzle_bgr_565__y;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR:
     case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      return wuffs_base__pixel_swizzler__xxx__y;
+      return wuffs_private_impl__swizzle_xxx__y;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
@@ -23726,42 +25896,43 @@
     case WUFFS_BASE__PIXEL_FORMAT__RGBX:
 #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
       if (wuffs_base__cpu_arch__have_x86_sse42()) {
-        return wuffs_base__pixel_swizzler__xxxx__y__x86_sse42;
+        return wuffs_private_impl__swizzle_xxxx__y__x86_sse42;
       }
 #endif
-      return wuffs_base__pixel_swizzler__xxxx__y;
+      return wuffs_private_impl__swizzle_xxxx__y;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE:
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL_4X16LE:
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL_4X16LE:
-      return wuffs_base__pixel_swizzler__xxxxxxxx__y;
+      return wuffs_private_impl__swizzle_xxxxxxxx__y;
   }
   return NULL;
 }
 
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__y_16be(wuffs_base__pixel_swizzler* p,
-                                            wuffs_base__pixel_format dst_pixfmt,
-                                            wuffs_base__slice_u8 dst_palette,
-                                            wuffs_base__slice_u8 src_palette,
-                                            wuffs_base__pixel_blend blend) {
+static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func  //
+wuffs_private_impl__pixel_swizzler__prepare__y_16be(
+    wuffs_base__pixel_swizzler* p,
+    wuffs_base__pixel_format dst_pixfmt,
+    wuffs_base__slice_u8 dst_palette,
+    wuffs_base__slice_u8 src_palette,
+    wuffs_base__pixel_blend blend) {
   switch (dst_pixfmt.repr) {
     case WUFFS_BASE__PIXEL_FORMAT__Y:
-      return wuffs_base__pixel_swizzler__y__y_16be;
+      return wuffs_private_impl__swizzle_y__y_16be;
 
     case WUFFS_BASE__PIXEL_FORMAT__Y_16LE:
-      return wuffs_base__pixel_swizzler__y_16le__y_16be;
+      return wuffs_private_impl__swizzle_y_16le__y_16be;
 
     case WUFFS_BASE__PIXEL_FORMAT__Y_16BE:
-      return wuffs_base__pixel_swizzler__copy_2_2;
+      return wuffs_private_impl__swizzle_copy_2_2;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      return wuffs_base__pixel_swizzler__bgr_565__y_16be;
+      return wuffs_private_impl__swizzle_bgr_565__y_16be;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR:
     case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      return wuffs_base__pixel_swizzler__xxx__y_16be;
+      return wuffs_private_impl__swizzle_xxx__y_16be;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
@@ -23771,19 +25942,88 @@
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
     case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      return wuffs_base__pixel_swizzler__xxxx__y_16be;
+      return wuffs_private_impl__swizzle_xxxx__y_16be;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE:
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL_4X16LE:
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL_4X16LE:
-      return wuffs_base__pixel_swizzler__xxxxxxxx__y_16be;
+      return wuffs_private_impl__swizzle_xxxxxxxx__y_16be;
   }
   return NULL;
 }
 
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__indexed__bgra_nonpremul(
+static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func  //
+wuffs_private_impl__pixel_swizzler__prepare__ya_nonpremul(
+    wuffs_base__pixel_swizzler* p,
+    wuffs_base__pixel_format dst_pixfmt,
+    wuffs_base__slice_u8 dst_palette,
+    wuffs_base__slice_u8 src_palette,
+    wuffs_base__pixel_blend blend) {
+  switch (dst_pixfmt.repr) {
+    case WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_copy_2_2;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_ya_nonpremul__ya_nonpremul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgr_565__ya_nonpremul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgr_565__ya_nonpremul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGR:
+    case WUFFS_BASE__PIXEL_FORMAT__RGB:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_xxx__ya_nonpremul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_xxx__ya_nonpremul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgra_nonpremul__ya_nonpremul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_nonpremul__ya_nonpremul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgra_premul__ya_nonpremul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_premul__ya_nonpremul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL_4X16LE:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__ya_nonpremul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__ya_nonpremul__src_over;
+      }
+      return NULL;
+  }
+  return NULL;
+}
+
+static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func  //
+wuffs_private_impl__pixel_swizzler__prepare__indexed__bgra_nonpremul(
     wuffs_base__pixel_swizzler* p,
     wuffs_base__pixel_format dst_pixfmt,
     wuffs_base__slice_u8 dst_palette,
@@ -23791,122 +26031,128 @@
     wuffs_base__pixel_blend blend) {
   switch (dst_pixfmt.repr) {
     case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:
-      if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
+      if (wuffs_private_impl__slice_u8__copy_from_slice(dst_palette,
+                                                        src_palette) !=
           WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
         return NULL;
       }
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__copy_1_1;
+          return wuffs_private_impl__swizzle_copy_1_1;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          if (wuffs_base__pixel_swizzler__squash_align4_bgr_565_8888(
+          if (wuffs_private_impl__swizzle_squash_align4_bgr_565_8888(
                   dst_palette.ptr, dst_palette.len, src_palette.ptr,
                   src_palette.len, true) !=
               (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
             return NULL;
           }
-          return wuffs_base__pixel_swizzler__bgr_565__index__src;
+          return wuffs_private_impl__swizzle_bgr_565__index__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
+          if (wuffs_private_impl__slice_u8__copy_from_slice(dst_palette,
+                                                            src_palette) !=
               WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
             return NULL;
           }
-          return wuffs_base__pixel_swizzler__bgr_565__index_bgra_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_bgr_565__index_bgra_nonpremul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          if (wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src(
+          if (wuffs_private_impl__swizzle_bgra_premul__bgra_nonpremul__src(
                   dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
                   src_palette.len) !=
               (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
             return NULL;
           }
-          return wuffs_base__pixel_swizzler__xxx__index__src;
+          return wuffs_private_impl__swizzle_xxx__index__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
+          if (wuffs_private_impl__slice_u8__copy_from_slice(dst_palette,
+                                                            src_palette) !=
               WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
             return NULL;
           }
-          return wuffs_base__pixel_swizzler__xxx__index_bgra_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_xxx__index_bgra_nonpremul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
+      if (wuffs_private_impl__slice_u8__copy_from_slice(dst_palette,
+                                                        src_palette) !=
           WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
         return NULL;
       }
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxxx__index__src;
+          return wuffs_private_impl__swizzle_xxxx__index__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__index_bgra_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_bgra_nonpremul__index_bgra_nonpremul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
+      if (wuffs_private_impl__slice_u8__copy_from_slice(dst_palette,
+                                                        src_palette) !=
           WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
         return NULL;
       }
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxxxxxxx__index__src;
+          return wuffs_private_impl__swizzle_xxxxxxxx__index__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__index_bgra_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__index_bgra_nonpremul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          if (wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src(
+          if (wuffs_private_impl__swizzle_bgra_premul__bgra_nonpremul__src(
                   dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
                   src_palette.len) !=
               (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
             return NULL;
           }
-          return wuffs_base__pixel_swizzler__xxxx__index__src;
+          return wuffs_private_impl__swizzle_xxxx__index__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
+          if (wuffs_private_impl__slice_u8__copy_from_slice(dst_palette,
+                                                            src_palette) !=
               WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
             return NULL;
           }
-          return wuffs_base__pixel_swizzler__bgra_premul__index_bgra_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_bgra_premul__index_bgra_nonpremul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGB:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          if (wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src(
+          if (wuffs_private_impl__swizzle_bgra_premul__rgba_nonpremul__src(
                   dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
                   src_palette.len) !=
               (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
             return NULL;
           }
-          return wuffs_base__pixel_swizzler__xxx__index__src;
+          return wuffs_private_impl__swizzle_xxx__index__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(
+          if (wuffs_private_impl__swizzle_swap_rgbx_bgrx(
                   dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
                   src_palette.len) !=
               (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
             return NULL;
           }
-          return wuffs_base__pixel_swizzler__xxx__index_bgra_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_xxx__index_bgra_nonpremul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(
+      if (wuffs_private_impl__swizzle_swap_rgbx_bgrx(
               dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
               src_palette.len) !=
           (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
@@ -23914,30 +26160,30 @@
       }
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxxx__index__src;
+          return wuffs_private_impl__swizzle_xxxx__index__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__index_bgra_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_bgra_nonpremul__index_bgra_nonpremul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          if (wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src(
+          if (wuffs_private_impl__swizzle_bgra_premul__rgba_nonpremul__src(
                   dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
                   src_palette.len) !=
               (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
             return NULL;
           }
-          return wuffs_base__pixel_swizzler__xxxx__index__src;
+          return wuffs_private_impl__swizzle_xxxx__index__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(
+          if (wuffs_private_impl__swizzle_swap_rgbx_bgrx(
                   dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
                   src_palette.len) !=
               (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
             return NULL;
           }
-          return wuffs_base__pixel_swizzler__bgra_premul__index_bgra_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_bgra_premul__index_bgra_nonpremul__src_over;
       }
       return NULL;
 
@@ -23948,8 +26194,8 @@
   return NULL;
 }
 
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__indexed__bgra_binary(
+static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func  //
+wuffs_private_impl__pixel_swizzler__prepare__indexed__bgra_binary(
     wuffs_base__pixel_swizzler* p,
     wuffs_base__pixel_format dst_pixfmt,
     wuffs_base__slice_u8 dst_palette,
@@ -23959,18 +26205,19 @@
     case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:
-      if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
+      if (wuffs_private_impl__slice_u8__copy_from_slice(dst_palette,
+                                                        src_palette) !=
           WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
         return NULL;
       }
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__copy_1_1;
+          return wuffs_private_impl__swizzle_copy_1_1;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      if (wuffs_base__pixel_swizzler__squash_align4_bgr_565_8888(
+      if (wuffs_private_impl__swizzle_squash_align4_bgr_565_8888(
               dst_palette.ptr, dst_palette.len, src_palette.ptr,
               src_palette.len, false) !=
           (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
@@ -23978,56 +26225,59 @@
       }
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr_565__index__src;
+          return wuffs_private_impl__swizzle_bgr_565__index__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr_565__index_binary_alpha__src_over;
+          return wuffs_private_impl__swizzle_bgr_565__index_binary_alpha__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
+      if (wuffs_private_impl__slice_u8__copy_from_slice(dst_palette,
+                                                        src_palette) !=
           WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
         return NULL;
       }
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxx__index__src;
+          return wuffs_private_impl__swizzle_xxx__index__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over;
+          return wuffs_private_impl__swizzle_xxx__index_binary_alpha__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-      if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
+      if (wuffs_private_impl__slice_u8__copy_from_slice(dst_palette,
+                                                        src_palette) !=
           WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
         return NULL;
       }
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxxx__index__src;
+          return wuffs_private_impl__swizzle_xxxx__index__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over;
+          return wuffs_private_impl__swizzle_xxxx__index_binary_alpha__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE:
-      if (wuffs_base__slice_u8__copy_from_slice(dst_palette, src_palette) !=
+      if (wuffs_private_impl__slice_u8__copy_from_slice(dst_palette,
+                                                        src_palette) !=
           WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH) {
         return NULL;
       }
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxxxxxxx__index__src;
+          return wuffs_private_impl__swizzle_xxxxxxxx__index__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__xxxxxxxx__index_binary_alpha__src_over;
+          return wuffs_private_impl__swizzle_xxxxxxxx__index_binary_alpha__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(
+      if (wuffs_private_impl__swizzle_swap_rgbx_bgrx(
               dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
               src_palette.len) !=
           (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
@@ -24035,16 +26285,16 @@
       }
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxx__index__src;
+          return wuffs_private_impl__swizzle_xxx__index__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__xxx__index_binary_alpha__src_over;
+          return wuffs_private_impl__swizzle_xxx__index_binary_alpha__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-      if (wuffs_base__pixel_swizzler__swap_rgbx_bgrx(
+      if (wuffs_private_impl__swizzle_swap_rgbx_bgrx(
               dst_palette.ptr, dst_palette.len, NULL, 0, src_palette.ptr,
               src_palette.len) !=
           (WUFFS_BASE__PIXEL_FORMAT__INDEXED__PALETTE_BYTE_LENGTH / 4)) {
@@ -24052,17 +26302,17 @@
       }
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__xxxx__index__src;
+          return wuffs_private_impl__swizzle_xxxx__index__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__xxxx__index_binary_alpha__src_over;
+          return wuffs_private_impl__swizzle_xxxx__index_binary_alpha__src_over;
       }
       return NULL;
   }
   return NULL;
 }
 
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__bgr_565(
+static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func  //
+wuffs_private_impl__pixel_swizzler__prepare__bgr_565(
     wuffs_base__pixel_swizzler* p,
     wuffs_base__pixel_format dst_pixfmt,
     wuffs_base__slice_u8 dst_palette,
@@ -24070,75 +26320,35 @@
     wuffs_base__pixel_blend blend) {
   switch (dst_pixfmt.repr) {
     case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      return wuffs_base__pixel_swizzler__copy_2_2;
+      return wuffs_private_impl__swizzle_copy_2_2;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      return wuffs_base__pixel_swizzler__bgr__bgr_565;
+      return wuffs_private_impl__swizzle_bgr__bgr_565;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
     case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      return wuffs_base__pixel_swizzler__bgrw__bgr_565;
+      return wuffs_private_impl__swizzle_bgrw__bgr_565;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE:
-      return wuffs_base__pixel_swizzler__bgrw_4x16le__bgr_565;
+      return wuffs_private_impl__swizzle_bgrw_4x16le__bgr_565;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      return wuffs_base__pixel_swizzler__rgb__bgr_565;
+      return wuffs_private_impl__swizzle_rgb__bgr_565;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
     case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      return wuffs_base__pixel_swizzler__rgbw__bgr_565;
+      return wuffs_private_impl__swizzle_rgbw__bgr_565;
   }
   return NULL;
 }
 
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__bgr(wuffs_base__pixel_swizzler* p,
-                                         wuffs_base__pixel_format dst_pixfmt,
-                                         wuffs_base__slice_u8 dst_palette,
-                                         wuffs_base__slice_u8 src_palette,
-                                         wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      return wuffs_base__pixel_swizzler__bgr_565__bgr;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      return wuffs_base__pixel_swizzler__copy_3_3;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      return wuffs_base__pixel_swizzler__bgrw__bgr;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE:
-      return wuffs_base__pixel_swizzler__bgrw_4x16le__bgr;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      return wuffs_base__pixel_swizzler__swap_rgb_bgr;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-      if (wuffs_base__cpu_arch__have_x86_sse42()) {
-        return wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42;
-      }
-#endif
-      return wuffs_base__pixel_swizzler__bgrw__rgb;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__bgra_nonpremul(
+static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func  //
+wuffs_private_impl__pixel_swizzler__prepare__bgr(
     wuffs_base__pixel_swizzler* p,
     wuffs_base__pixel_format dst_pixfmt,
     wuffs_base__slice_u8 dst_palette,
@@ -24146,324 +26356,10 @@
     wuffs_base__pixel_blend blend) {
   switch (dst_pixfmt.repr) {
     case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul__src_over;
-      }
-      return NULL;
+      return wuffs_private_impl__swizzle_bgr_565__bgr;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__copy_4_4;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      // TODO.
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-          if (wuffs_base__cpu_arch__have_x86_sse42()) {
-            return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42;
-          }
-#endif
-          return wuffs_base__pixel_swizzler__swap_rgbx_bgrx;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      // TODO.
-      break;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__bgra_nonpremul_4x16le(
-    wuffs_base__pixel_swizzler* p,
-    wuffs_base__pixel_format dst_pixfmt,
-    wuffs_base__slice_u8 dst_palette,
-    wuffs_base__slice_u8 src_palette,
-    wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul_4x16le__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr_565__bgra_nonpremul_4x16le__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul_4x16le__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul_4x16le__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_nonpremul_4x16le__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_nonpremul_4x16le__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__copy_8_8;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_nonpremul_4x16le__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul_4x16le__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul_4x16le__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      // TODO.
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul_4x16le__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__rgba_nonpremul__bgra_nonpremul_4x16le__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__rgba_nonpremul__bgra_nonpremul_4x16le__src_over;
-      }
-      break;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul_4x16le__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul_4x16le__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      // TODO.
-      break;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__bgra_premul(
-    wuffs_base__pixel_swizzler* p,
-    wuffs_base__pixel_format dst_pixfmt,
-    wuffs_base__slice_u8 dst_palette,
-    wuffs_base__slice_u8 src_palette,
-    wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr_565__bgra_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr_565__bgra_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__bgra_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__bgra_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__bgra_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__copy_4_4;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__rgba_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__rgba_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_premul__src;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_premul__src_over;
-      }
-      return NULL;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-      switch (blend) {
-        case WUFFS_BASE__PIXEL_BLEND__SRC:
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-          if (wuffs_base__cpu_arch__have_x86_sse42()) {
-            return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42;
-          }
-#endif
-          return wuffs_base__pixel_swizzler__swap_rgbx_bgrx;
-        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_premul__src_over;
-      }
-      return NULL;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__bgrx(wuffs_base__pixel_swizzler* p,
-                                          wuffs_base__pixel_format dst_pixfmt,
-                                          wuffs_base__slice_u8 dst_palette,
-                                          wuffs_base__slice_u8 src_palette,
-                                          wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      return wuffs_base__pixel_swizzler__bgr_565__bgrx;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      return wuffs_base__pixel_swizzler__xxx__xxxx;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
-      return wuffs_base__pixel_swizzler__bgrw__bgrx;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      return wuffs_base__pixel_swizzler__bgrw_4x16le__bgrx;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      return wuffs_base__pixel_swizzler__copy_4_4;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      return wuffs_base__pixel_swizzler__bgr__rgbx;
-
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
-    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      return wuffs_base__pixel_swizzler__bgrw__rgbx;
-  }
-  return NULL;
-}
-
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__rgb(wuffs_base__pixel_swizzler* p,
-                                         wuffs_base__pixel_format dst_pixfmt,
-                                         wuffs_base__slice_u8 dst_palette,
-                                         wuffs_base__slice_u8 src_palette,
-                                         wuffs_base__pixel_blend blend) {
-  switch (dst_pixfmt.repr) {
-    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      return wuffs_base__pixel_swizzler__bgr_565__rgb;
-
-    case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      return wuffs_base__pixel_swizzler__swap_rgb_bgr;
+      return wuffs_private_impl__swizzle_copy_3_3;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
@@ -24471,28 +26367,34 @@
     case WUFFS_BASE__PIXEL_FORMAT__BGRX:
 #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
       if (wuffs_base__cpu_arch__have_x86_sse42()) {
-        return wuffs_base__pixel_swizzler__bgrw__rgb__x86_sse42;
+        return wuffs_private_impl__swizzle_bgrw__bgr__x86_sse42;
       }
 #endif
-      return wuffs_base__pixel_swizzler__bgrw__rgb;
+      return wuffs_private_impl__swizzle_bgrw__bgr;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      return wuffs_base__pixel_swizzler__bgrw_4x16le__rgb;
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL_4X16LE:
+      return wuffs_private_impl__swizzle_bgrw_4x16le__bgr;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      return wuffs_base__pixel_swizzler__copy_3_3;
+      return wuffs_private_impl__swizzle_swap_rgb_bgr;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
     case WUFFS_BASE__PIXEL_FORMAT__RGBX:
-      return wuffs_base__pixel_swizzler__bgrw__bgr;
+#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
+      if (wuffs_base__cpu_arch__have_x86_sse42()) {
+        return wuffs_private_impl__swizzle_bgrw__rgb__x86_sse42;
+      }
+#endif
+      return wuffs_private_impl__swizzle_bgrw__rgb;
   }
   return NULL;
 }
 
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__rgba_nonpremul(
+static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func  //
+wuffs_private_impl__pixel_swizzler__prepare__bgra_nonpremul(
     wuffs_base__pixel_swizzler* p,
     wuffs_base__pixel_format dst_pixfmt,
     wuffs_base__slice_u8 dst_palette,
@@ -24502,50 +26404,45 @@
     case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr_565__rgba_nonpremul__src;
+          return wuffs_private_impl__swizzle_bgr_565__bgra_nonpremul__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr_565__rgba_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_bgr_565__bgra_nonpremul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src;
+          return wuffs_private_impl__swizzle_bgr__bgra_nonpremul__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__rgba_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_bgr__bgra_nonpremul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
-          if (wuffs_base__cpu_arch__have_x86_sse42()) {
-            return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42;
-          }
-#endif
-          return wuffs_base__pixel_swizzler__swap_rgbx_bgrx;
+          return wuffs_private_impl__swizzle_copy_4_4;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_bgra_nonpremul__bgra_nonpremul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_nonpremul__src;
+          return wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__bgra_nonpremul__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__bgra_nonpremul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src;
+          return wuffs_private_impl__swizzle_bgra_premul__bgra_nonpremul__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_bgra_premul__bgra_nonpremul__src_over;
       }
       return NULL;
 
@@ -24557,27 +26454,32 @@
     case WUFFS_BASE__PIXEL_FORMAT__RGB:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src;
+          return wuffs_private_impl__swizzle_bgr__rgba_nonpremul__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__bgra_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_bgr__rgba_nonpremul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__copy_4_4;
+#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
+          if (wuffs_base__cpu_arch__have_x86_sse42()) {
+            return wuffs_private_impl__swizzle_swap_rgbx_bgrx__x86_sse42;
+          }
+#endif
+          return wuffs_private_impl__swizzle_swap_rgbx_bgrx;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_bgra_nonpremul__rgba_nonpremul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src;
+          return wuffs_private_impl__swizzle_bgra_premul__rgba_nonpremul__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_nonpremul__src_over;
+          return wuffs_private_impl__swizzle_bgra_premul__rgba_nonpremul__src_over;
       }
       return NULL;
 
@@ -24589,8 +26491,8 @@
   return NULL;
 }
 
-static wuffs_base__pixel_swizzler__func  //
-wuffs_base__pixel_swizzler__prepare__rgba_premul(
+static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func  //
+wuffs_private_impl__pixel_swizzler__prepare__bgra_nonpremul_4x16le(
     wuffs_base__pixel_swizzler* p,
     wuffs_base__pixel_format dst_pixfmt,
     wuffs_base__slice_u8 dst_palette,
@@ -24600,36 +26502,397 @@
     case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr_565__rgba_premul__src;
+          return wuffs_private_impl__swizzle_bgr_565__bgra_nonpremul_4x16le__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr_565__rgba_premul__src_over;
+          return wuffs_private_impl__swizzle_bgr_565__bgra_nonpremul_4x16le__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__rgba_premul__src;
+          return wuffs_private_impl__swizzle_bgr__bgra_nonpremul_4x16le__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__rgba_premul__src_over;
+          return wuffs_private_impl__swizzle_bgr__bgra_nonpremul_4x16le__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_premul__src;
+          return wuffs_private_impl__swizzle_bgra_nonpremul__bgra_nonpremul_4x16le__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__rgba_premul__src_over;
+          return wuffs_private_impl__swizzle_bgra_nonpremul__bgra_nonpremul_4x16le__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_premul__src;
+          return wuffs_private_impl__swizzle_copy_8_8;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul_4x16le__rgba_premul__src_over;
+          return wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__bgra_nonpremul_4x16le__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgra_premul__bgra_nonpremul_4x16le__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_premul__bgra_nonpremul_4x16le__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
+    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
+      // TODO.
+      break;
+
+    case WUFFS_BASE__PIXEL_FORMAT__RGB:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgr__rgba_nonpremul_4x16le__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgr__rgba_nonpremul_4x16le__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_rgba_nonpremul__bgra_nonpremul_4x16le__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_rgba_nonpremul__bgra_nonpremul_4x16le__src_over;
+      }
+      break;
+
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgra_premul__rgba_nonpremul_4x16le__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_premul__rgba_nonpremul_4x16le__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
+    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
+      // TODO.
+      break;
+  }
+  return NULL;
+}
+
+static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func  //
+wuffs_private_impl__pixel_swizzler__prepare__bgra_premul(
+    wuffs_base__pixel_swizzler* p,
+    wuffs_base__pixel_format dst_pixfmt,
+    wuffs_base__slice_u8 dst_palette,
+    wuffs_base__slice_u8 src_palette,
+    wuffs_base__pixel_blend blend) {
+  switch (dst_pixfmt.repr) {
+    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgr_565__bgra_premul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgr_565__bgra_premul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGR:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgr__bgra_premul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgr__bgra_premul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgra_nonpremul__bgra_premul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_nonpremul__bgra_premul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__bgra_premul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__bgra_premul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_copy_4_4;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_premul__bgra_premul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__RGB:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgr__rgba_premul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgr__rgba_premul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgra_nonpremul__rgba_premul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_nonpremul__rgba_premul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
+          if (wuffs_base__cpu_arch__have_x86_sse42()) {
+            return wuffs_private_impl__swizzle_swap_rgbx_bgrx__x86_sse42;
+          }
+#endif
+          return wuffs_private_impl__swizzle_swap_rgbx_bgrx;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_premul__rgba_premul__src_over;
+      }
+      return NULL;
+  }
+  return NULL;
+}
+
+static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func  //
+wuffs_private_impl__pixel_swizzler__prepare__bgrx(
+    wuffs_base__pixel_swizzler* p,
+    wuffs_base__pixel_format dst_pixfmt,
+    wuffs_base__slice_u8 dst_palette,
+    wuffs_base__slice_u8 src_palette,
+    wuffs_base__pixel_blend blend) {
+  switch (dst_pixfmt.repr) {
+    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
+      return wuffs_private_impl__swizzle_bgr_565__bgrx;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGR:
+      return wuffs_private_impl__swizzle_xxx__xxxx;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
+      return wuffs_private_impl__swizzle_bgrw__bgrx;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
+      return wuffs_private_impl__swizzle_bgrw_4x16le__bgrx;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
+      return wuffs_private_impl__swizzle_copy_4_4;
+
+    case WUFFS_BASE__PIXEL_FORMAT__RGB:
+      return wuffs_private_impl__swizzle_bgr__rgbx;
+
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
+    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
+      return wuffs_private_impl__swizzle_bgrw__rgbx;
+  }
+  return NULL;
+}
+
+static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func  //
+wuffs_private_impl__pixel_swizzler__prepare__rgb(
+    wuffs_base__pixel_swizzler* p,
+    wuffs_base__pixel_format dst_pixfmt,
+    wuffs_base__slice_u8 dst_palette,
+    wuffs_base__slice_u8 src_palette,
+    wuffs_base__pixel_blend blend) {
+  switch (dst_pixfmt.repr) {
+    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
+      return wuffs_private_impl__swizzle_bgr_565__rgb;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGR:
+      return wuffs_private_impl__swizzle_swap_rgb_bgr;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
+    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
+#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
+      if (wuffs_base__cpu_arch__have_x86_sse42()) {
+        return wuffs_private_impl__swizzle_bgrw__rgb__x86_sse42;
+      }
+#endif
+      return wuffs_private_impl__swizzle_bgrw__rgb;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
+      return wuffs_private_impl__swizzle_bgrw_4x16le__rgb;
+
+    case WUFFS_BASE__PIXEL_FORMAT__RGB:
+      return wuffs_private_impl__swizzle_copy_3_3;
+
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
+    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
+#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
+      if (wuffs_base__cpu_arch__have_x86_sse42()) {
+        return wuffs_private_impl__swizzle_bgrw__bgr__x86_sse42;
+      }
+#endif
+      return wuffs_private_impl__swizzle_bgrw__bgr;
+  }
+  return NULL;
+}
+
+static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func  //
+wuffs_private_impl__pixel_swizzler__prepare__rgba_nonpremul(
+    wuffs_base__pixel_swizzler* p,
+    wuffs_base__pixel_format dst_pixfmt,
+    wuffs_base__slice_u8 dst_palette,
+    wuffs_base__slice_u8 src_palette,
+    wuffs_base__pixel_blend blend) {
+  switch (dst_pixfmt.repr) {
+    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgr_565__rgba_nonpremul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgr_565__rgba_nonpremul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGR:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgr__rgba_nonpremul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgr__rgba_nonpremul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+#if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
+          if (wuffs_base__cpu_arch__have_x86_sse42()) {
+            return wuffs_private_impl__swizzle_swap_rgbx_bgrx__x86_sse42;
+          }
+#endif
+          return wuffs_private_impl__swizzle_swap_rgbx_bgrx;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_nonpremul__rgba_nonpremul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__rgba_nonpremul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__rgba_nonpremul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgra_premul__rgba_nonpremul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_premul__rgba_nonpremul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_BINARY:
+    case WUFFS_BASE__PIXEL_FORMAT__BGRX:
+      // TODO.
+      break;
+
+    case WUFFS_BASE__PIXEL_FORMAT__RGB:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgr__bgra_nonpremul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgr__bgra_nonpremul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_copy_4_4;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_nonpremul__bgra_nonpremul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgra_premul__bgra_nonpremul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_premul__bgra_nonpremul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_BINARY:
+    case WUFFS_BASE__PIXEL_FORMAT__RGBX:
+      // TODO.
+      break;
+  }
+  return NULL;
+}
+
+static inline WUFFS_BASE__FORCE_INLINE wuffs_base__pixel_swizzler__func  //
+wuffs_private_impl__pixel_swizzler__prepare__rgba_premul(
+    wuffs_base__pixel_swizzler* p,
+    wuffs_base__pixel_format dst_pixfmt,
+    wuffs_base__slice_u8 dst_palette,
+    wuffs_base__slice_u8 src_palette,
+    wuffs_base__pixel_blend blend) {
+  switch (dst_pixfmt.repr) {
+    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgr_565__rgba_premul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgr_565__rgba_premul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGR:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgr__rgba_premul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgr__rgba_premul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgra_nonpremul__rgba_premul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_nonpremul__rgba_premul__src_over;
+      }
+      return NULL;
+
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
+      switch (blend) {
+        case WUFFS_BASE__PIXEL_BLEND__SRC:
+          return wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__rgba_premul__src;
+        case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
+          return wuffs_private_impl__swizzle_bgra_nonpremul_4x16le__rgba_premul__src_over;
       }
       return NULL;
 
@@ -24638,39 +26901,39 @@
         case WUFFS_BASE__PIXEL_BLEND__SRC:
 #if defined(WUFFS_BASE__CPU_ARCH__X86_FAMILY)
           if (wuffs_base__cpu_arch__have_x86_sse42()) {
-            return wuffs_base__pixel_swizzler__swap_rgbx_bgrx__x86_sse42;
+            return wuffs_private_impl__swizzle_swap_rgbx_bgrx__x86_sse42;
           }
 #endif
-          return wuffs_base__pixel_swizzler__swap_rgbx_bgrx;
+          return wuffs_private_impl__swizzle_swap_rgbx_bgrx;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__rgba_premul__src_over;
+          return wuffs_private_impl__swizzle_bgra_premul__rgba_premul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGB:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgr__bgra_premul__src;
+          return wuffs_private_impl__swizzle_bgr__bgra_premul__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgr__bgra_premul__src_over;
+          return wuffs_private_impl__swizzle_bgr__bgra_premul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_premul__src;
+          return wuffs_private_impl__swizzle_bgra_nonpremul__bgra_premul__src;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_nonpremul__bgra_premul__src_over;
+          return wuffs_private_impl__swizzle_bgra_nonpremul__bgra_premul__src_over;
       }
       return NULL;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
       switch (blend) {
         case WUFFS_BASE__PIXEL_BLEND__SRC:
-          return wuffs_base__pixel_swizzler__copy_4_4;
+          return wuffs_private_impl__swizzle_copy_4_4;
         case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
-          return wuffs_base__pixel_swizzler__bgra_premul__bgra_premul__src_over;
+          return wuffs_private_impl__swizzle_bgra_premul__bgra_premul__src_over;
       }
       return NULL;
   }
@@ -24694,6 +26957,50 @@
   p->private_impl.dst_pixfmt_bytes_per_pixel = 0;
   p->private_impl.src_pixfmt_bytes_per_pixel = 0;
 
+  // ----
+
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ENABLE_ALLOWLIST)
+  switch (dst_pixfmt.repr) {
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_BGR_565)
+    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
+      break;
+#endif
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_BGR)
+    case WUFFS_BASE__PIXEL_FORMAT__BGR:
+      break;
+#endif
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_BGRA_NONPREMUL)
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
+      break;
+#endif
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_BGRA_NONPREMUL_4X16LE)
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
+      break;
+#endif
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_BGRA_PREMUL)
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
+      break;
+#endif
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_RGB)
+    case WUFFS_BASE__PIXEL_FORMAT__RGB:
+      break;
+#endif
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_RGBA_NONPREMUL)
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
+      break;
+#endif
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_RGBA_PREMUL)
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
+      break;
+#endif
+    default:
+      return wuffs_base__make_status(
+          wuffs_base__error__disabled_by_wuffs_config_dst_pixel_format_enable_allowlist);
+  }
+#endif  // defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ENABLE_ALLOWLIST)
+
+  // ----
+
   wuffs_base__pixel_swizzler__func func = NULL;
   wuffs_base__pixel_swizzler__transparent_black_func transparent_black_func =
       NULL;
@@ -24719,78 +27026,84 @@
   switch (blend) {
     case WUFFS_BASE__PIXEL_BLEND__SRC:
       transparent_black_func =
-          wuffs_base__pixel_swizzler__transparent_black_src;
+          wuffs_private_impl__swizzle_transparent_black_src;
       break;
 
     case WUFFS_BASE__PIXEL_BLEND__SRC_OVER:
       transparent_black_func =
-          wuffs_base__pixel_swizzler__transparent_black_src_over;
+          wuffs_private_impl__swizzle_transparent_black_src_over;
       break;
   }
 
   switch (src_pixfmt.repr) {
     case WUFFS_BASE__PIXEL_FORMAT__Y:
-      func = wuffs_base__pixel_swizzler__prepare__y(p, dst_pixfmt, dst_palette,
-                                                    src_palette, blend);
+      func = wuffs_private_impl__pixel_swizzler__prepare__y(
+          p, dst_pixfmt, dst_palette, src_palette, blend);
       break;
 
     case WUFFS_BASE__PIXEL_FORMAT__Y_16BE:
-      func = wuffs_base__pixel_swizzler__prepare__y_16be(
+      func = wuffs_private_impl__pixel_swizzler__prepare__y_16be(
+          p, dst_pixfmt, dst_palette, src_palette, blend);
+      break;
+
+    case WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL:
+      func = wuffs_private_impl__pixel_swizzler__prepare__ya_nonpremul(
           p, dst_pixfmt, dst_palette, src_palette, blend);
       break;
 
     case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:
-      func = wuffs_base__pixel_swizzler__prepare__indexed__bgra_nonpremul(
-          p, dst_pixfmt, dst_palette, src_palette, blend);
+      func =
+          wuffs_private_impl__pixel_swizzler__prepare__indexed__bgra_nonpremul(
+              p, dst_pixfmt, dst_palette, src_palette, blend);
       break;
 
     case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:
-      func = wuffs_base__pixel_swizzler__prepare__indexed__bgra_binary(
+      func = wuffs_private_impl__pixel_swizzler__prepare__indexed__bgra_binary(
           p, dst_pixfmt, dst_palette, src_palette, blend);
       break;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
-      func = wuffs_base__pixel_swizzler__prepare__bgr_565(
+      func = wuffs_private_impl__pixel_swizzler__prepare__bgr_565(
           p, dst_pixfmt, dst_palette, src_palette, blend);
       break;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGR:
-      func = wuffs_base__pixel_swizzler__prepare__bgr(
+      func = wuffs_private_impl__pixel_swizzler__prepare__bgr(
           p, dst_pixfmt, dst_palette, src_palette, blend);
       break;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
-      func = wuffs_base__pixel_swizzler__prepare__bgra_nonpremul(
+      func = wuffs_private_impl__pixel_swizzler__prepare__bgra_nonpremul(
           p, dst_pixfmt, dst_palette, src_palette, blend);
       break;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
-      func = wuffs_base__pixel_swizzler__prepare__bgra_nonpremul_4x16le(
+      func = wuffs_private_impl__pixel_swizzler__prepare__bgra_nonpremul_4x16le(
           p, dst_pixfmt, dst_palette, src_palette, blend);
       break;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
-      func = wuffs_base__pixel_swizzler__prepare__bgra_premul(
+      func = wuffs_private_impl__pixel_swizzler__prepare__bgra_premul(
           p, dst_pixfmt, dst_palette, src_palette, blend);
       break;
 
     case WUFFS_BASE__PIXEL_FORMAT__BGRX:
-      func = wuffs_base__pixel_swizzler__prepare__bgrx(
+      func = wuffs_private_impl__pixel_swizzler__prepare__bgrx(
           p, dst_pixfmt, dst_palette, src_palette, blend);
       break;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGB:
-      func = wuffs_base__pixel_swizzler__prepare__rgb(
+      func = wuffs_private_impl__pixel_swizzler__prepare__rgb(
           p, dst_pixfmt, dst_palette, src_palette, blend);
       break;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
-      func = wuffs_base__pixel_swizzler__prepare__rgba_nonpremul(
+      func = wuffs_private_impl__pixel_swizzler__prepare__rgba_nonpremul(
           p, dst_pixfmt, dst_palette, src_palette, blend);
       break;
 
     case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
-      func = wuffs_base__pixel_swizzler__prepare__rgba_premul(
+      func = wuffs_private_impl__pixel_swizzler__prepare__rgba_premul(
           p, dst_pixfmt, dst_palette, src_palette, blend);
       break;
   }
@@ -24877,7 +27190,7 @@
 #if defined(WUFFS_BASE__CPU_ARCH__X86_64)
 WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2")
 static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx_x86_avx2(
+wuffs_private_impl__swizzle_ycc__convert_3_bgrx_x86_avx2(
     wuffs_base__pixel_buffer* dst,
     uint32_t x,
     uint32_t x_end,
@@ -24888,7 +27201,7 @@
 
 WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2")
 static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx_x86_avx2(
+wuffs_private_impl__swizzle_ycc__convert_3_rgbx_x86_avx2(
     wuffs_base__pixel_buffer* dst,
     uint32_t x,
     uint32_t x_end,
@@ -24902,7 +27215,7 @@
 #else
 WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2")
 static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v2_triangle_x86_avx2(
+wuffs_private_impl__swizzle_ycc__upsample_inv_h2v2_triangle_x86_avx2(
     uint8_t* dst_ptr,
     const uint8_t* src_ptr_major,
     const uint8_t* src_ptr_minor,
@@ -24916,18 +27229,21 @@
 // --------
 
 static inline uint32_t  //
-wuffs_base__u32__max_of_4(uint32_t a, uint32_t b, uint32_t c, uint32_t d) {
+wuffs_private_impl__u32__max_of_4(uint32_t a,
+                                  uint32_t b,
+                                  uint32_t c,
+                                  uint32_t d) {
   return wuffs_base__u32__max(     //
       wuffs_base__u32__max(a, b),  //
       wuffs_base__u32__max(c, d));
 }
 
 static inline uint32_t  //
-wuffs_base__u32__min_of_5(uint32_t a,
-                          uint32_t b,
-                          uint32_t c,
-                          uint32_t d,
-                          uint32_t e) {
+wuffs_private_impl__u32__min_of_5(uint32_t a,
+                                  uint32_t b,
+                                  uint32_t c,
+                                  uint32_t d,
+                                  uint32_t e) {
   return wuffs_base__u32__min(          //
       wuffs_base__u32__min(             //
           wuffs_base__u32__min(a, b),   //
@@ -24937,7 +27253,7 @@
 
 // --------
 
-typedef void (*wuffs_base__pixel_swizzler__swizzle_ycc__convert_4_func)(
+typedef void (*wuffs_private_impl__swizzle_ycc__convert_4_func)(
     wuffs_base__pixel_buffer* dst,
     uint32_t x,
     uint32_t x_end,
@@ -24948,7 +27264,7 @@
     const uint8_t* up3);
 
 static void  //
-wuffs_base__pixel_swizzler__swizzle_cmyk__convert_4_general(
+wuffs_private_impl__swizzle_cmyk__convert_4_general(
     wuffs_base__pixel_buffer* dst,
     uint32_t x,
     uint32_t x_end,
@@ -24974,7 +27290,7 @@
 }
 
 static void  //
-wuffs_base__pixel_swizzler__swizzle_ycck__convert_4_general(
+wuffs_private_impl__swizzle_ycck__convert_4_general(
     wuffs_base__pixel_buffer* dst,
     uint32_t x,
     uint32_t x_end,
@@ -25002,7 +27318,7 @@
 
 // --------
 
-typedef void (*wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func)(
+typedef void (*wuffs_private_impl__swizzle_ycc__convert_3_func)(
     wuffs_base__pixel_buffer* dst,
     uint32_t x,
     uint32_t x_end,
@@ -25012,7 +27328,7 @@
     const uint8_t* up2);
 
 static void  //
-wuffs_base__pixel_swizzler__swizzle_rgb__convert_3_general(
+wuffs_private_impl__swizzle_rgb__convert_3_general(
     wuffs_base__pixel_buffer* dst,
     uint32_t x,
     uint32_t x_end,
@@ -25030,7 +27346,7 @@
 }
 
 static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_general(
+wuffs_private_impl__swizzle_ycc__convert_3_general(
     wuffs_base__pixel_buffer* dst,
     uint32_t x,
     uint32_t x_end,
@@ -25047,14 +27363,13 @@
 }
 
 static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t x,
-    uint32_t x_end,
-    uint32_t y,
-    const uint8_t* up0,
-    const uint8_t* up1,
-    const uint8_t* up2) {
+wuffs_private_impl__swizzle_ycc__convert_3_bgrx(wuffs_base__pixel_buffer* dst,
+                                                uint32_t x,
+                                                uint32_t x_end,
+                                                uint32_t y,
+                                                const uint8_t* up0,
+                                                const uint8_t* up1,
+                                                const uint8_t* up2) {
   size_t dst_stride = dst->private_impl.planes[0].stride;
   uint8_t* dst_iter = dst->private_impl.planes[0].ptr +
                       (dst_stride * ((size_t)y)) + (4u * ((size_t)x));
@@ -25069,14 +27384,13 @@
 }
 
 static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx(
-    wuffs_base__pixel_buffer* dst,
-    uint32_t x,
-    uint32_t x_end,
-    uint32_t y,
-    const uint8_t* up0,
-    const uint8_t* up1,
-    const uint8_t* up2) {
+wuffs_private_impl__swizzle_ycc__convert_3_rgbx(wuffs_base__pixel_buffer* dst,
+                                                uint32_t x,
+                                                uint32_t x_end,
+                                                uint32_t y,
+                                                const uint8_t* up0,
+                                                const uint8_t* up1,
+                                                const uint8_t* up2) {
   size_t dst_stride = dst->private_impl.planes[0].stride;
   uint8_t* dst_iter = dst->private_impl.planes[0].ptr +
                       (dst_stride * ((size_t)y)) + (4u * ((size_t)x));
@@ -25092,11 +27406,11 @@
 
 // --------
 
-// wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upsamples to a
-// destination slice at least 480 (YCCK) or 672 (YCC) bytes long and whose
-// src_len (multiplied by 1, 2, 3 or 4) is positive but no more than that. This
-// 480 or 672 length is just under 1/4 or 1/3 of the scratch_buffer_2k slice
-// length. Both (480 * 4) = 1920 and (672 * 3) = 2016 are less than 2048.
+// wuffs_private_impl__swizzle_ycc__upsample_func upsamples to a destination
+// slice at least 480 (YCCK) or 672 (YCC) bytes long and whose src_len
+// (multiplied by 1, 2, 3 or 4) is positive but no more than that. This 480 or
+// 672 length is just under 1/4 or 1/3 of the scratch_buffer_2k slice length.
+// Both (480 * 4) = 1920 and (672 * 3) = 2016 are less than 2048.
 //
 // 480 and 672 are nice round numbers because a JPEG MCU is 1, 2, 3 or 4 blocks
 // wide and each block is 8 pixels wide. We have:
@@ -25116,8 +27430,7 @@
 // In practice, matching libjpeg-turbo, we only implement it for the common
 // chroma subsampling ratios (YCC420, YCC422 or YCC440), corresponding to an
 // (inv_h, inv_v) pair of (2, 2), (2, 1) or (1, 2).
-typedef const uint8_t* (
-    *wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func)(
+typedef const uint8_t* (*wuffs_private_impl__swizzle_ycc__upsample_func)(
     uint8_t* dst_ptr,
     const uint8_t* src_ptr_major,  // Nearest row.
     const uint8_t* src_ptr_minor,  // Adjacent row, alternating above or below.
@@ -25127,7 +27440,7 @@
     bool last_column);
 
 static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1vn_box(
+wuffs_private_impl__swizzle_ycc__upsample_inv_h1vn_box(
     uint8_t* dst_ptr,
     const uint8_t* src_ptr_major,
     const uint8_t* src_ptr_minor_ignored,
@@ -25139,7 +27452,7 @@
 }
 
 static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2vn_box(
+wuffs_private_impl__swizzle_ycc__upsample_inv_h2vn_box(
     uint8_t* dst_ptr,
     const uint8_t* src_ptr_major,
     const uint8_t* src_ptr_minor_ignored,
@@ -25158,7 +27471,7 @@
 }
 
 static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h3vn_box(
+wuffs_private_impl__swizzle_ycc__upsample_inv_h3vn_box(
     uint8_t* dst_ptr,
     const uint8_t* src_ptr_major,
     const uint8_t* src_ptr_minor_ignored,
@@ -25178,7 +27491,7 @@
 }
 
 static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h4vn_box(
+wuffs_private_impl__swizzle_ycc__upsample_inv_h4vn_box(
     uint8_t* dst_ptr,
     const uint8_t* src_ptr_major,
     const uint8_t* src_ptr_minor_ignored,
@@ -25199,7 +27512,7 @@
 }
 
 static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1v2_triangle(
+wuffs_private_impl__swizzle_ycc__upsample_inv_h1v2_triangle(
     uint8_t* dst_ptr,
     const uint8_t* src_ptr_major,
     const uint8_t* src_ptr_minor,
@@ -25220,7 +27533,7 @@
 }
 
 static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v1_triangle(
+wuffs_private_impl__swizzle_ycc__upsample_inv_h2v1_triangle(
     uint8_t* dst_ptr,
     const uint8_t* src_ptr_major,
     const uint8_t* src_ptr_minor,
@@ -25271,7 +27584,7 @@
 }
 
 static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v2_triangle(
+wuffs_private_impl__swizzle_ycc__upsample_inv_h2v2_triangle(
     uint8_t* dst_ptr,
     const uint8_t* src_ptr_major,
     const uint8_t* src_ptr_minor,
@@ -25338,38 +27651,38 @@
   return dst_ptr;
 }
 
-// wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs is indexed by inv_h
-// and then inv_v.
-static const wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs[4][4] = {
+// wuffs_private_impl__swizzle_ycc__upsample_funcs is indexed by inv_h and then
+// inv_v.
+static const wuffs_private_impl__swizzle_ycc__upsample_func
+    wuffs_private_impl__swizzle_ycc__upsample_funcs[4][4] = {
         {
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h1vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h1vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h1vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h1vn_box,
         },
         {
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h2vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h2vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h2vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h2vn_box,
         },
         {
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h3vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h3vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h3vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h3vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h3vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h3vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h3vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h3vn_box,
         },
         {
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h4vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h4vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h4vn_box,
-            wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h4vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h4vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h4vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h4vn_box,
+            wuffs_private_impl__swizzle_ycc__upsample_inv_h4vn_box,
         },
 };
 
 static inline uint32_t  //
-wuffs_base__pixel_swizzler__has_triangle_upsampler(uint32_t inv_h,
+wuffs_private_impl__swizzle_has_triangle_upsampler(uint32_t inv_h,
                                                    uint32_t inv_v) {
   if (inv_h == 1u) {
     return inv_v == 2u;
@@ -25381,13 +27694,13 @@
 
 // --------
 
-// All of the wuffs_base__pixel_swizzler__swizzle_ycc__etc functions have
+// All of the wuffs_private_impl__swizzle_ycc__etc functions have
 // preconditions. See all of the checks made in
 // wuffs_base__pixel_swizzler__swizzle_ycck before calling these functions. For
 // example, (width > 0) is a precondition, but there are many more.
 
 static void  //
-wuffs_base__pixel_swizzler__swizzle_ycck__general__triangle_filter_edge_row(
+wuffs_private_impl__swizzle_ycck__general__triangle_filter_edge_row(
     wuffs_base__pixel_buffer* dst,
     uint32_t width,
     uint32_t y,
@@ -25410,11 +27723,11 @@
     uint32_t half_width_for_2to1,
     uint32_t h1v2_bias,
     uint8_t* scratch_buffer_2k_ptr,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc3,
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_4_func conv4func) {
+    wuffs_private_impl__swizzle_ycc__upsample_func upfunc0,
+    wuffs_private_impl__swizzle_ycc__upsample_func upfunc1,
+    wuffs_private_impl__swizzle_ycc__upsample_func upfunc2,
+    wuffs_private_impl__swizzle_ycc__upsample_func upfunc3,
+    wuffs_private_impl__swizzle_ycc__convert_4_func conv4func) {
   const uint8_t* src0 = src_ptr0 + ((y / inv_v0) * (size_t)stride0);
   const uint8_t* src1 = src_ptr1 + ((y / inv_v1) * (size_t)stride1);
   const uint8_t* src2 = src_ptr2 + ((y / inv_v2) * (size_t)stride2);
@@ -25487,7 +27800,7 @@
 }
 
 static void  //
-wuffs_base__pixel_swizzler__swizzle_ycck__general__triangle_filter(
+wuffs_private_impl__swizzle_ycck__general__triangle_filter(
     wuffs_base__pixel_buffer* dst,
     uint32_t width,
     uint32_t height,
@@ -25510,20 +27823,20 @@
     uint32_t half_width_for_2to1,
     uint32_t half_height_for_2to1,
     uint8_t* scratch_buffer_2k_ptr,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func (*upfuncs)[4][4],
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_4_func conv4func) {
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 =
+    wuffs_private_impl__swizzle_ycc__upsample_func (*upfuncs)[4][4],
+    wuffs_private_impl__swizzle_ycc__convert_4_func conv4func) {
+  wuffs_private_impl__swizzle_ycc__upsample_func upfunc0 =
       (*upfuncs)[(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u];
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1 =
+  wuffs_private_impl__swizzle_ycc__upsample_func upfunc1 =
       (*upfuncs)[(inv_h1 - 1u) & 3u][(inv_v1 - 1u) & 3u];
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2 =
+  wuffs_private_impl__swizzle_ycc__upsample_func upfunc2 =
       (*upfuncs)[(inv_h2 - 1u) & 3u][(inv_v2 - 1u) & 3u];
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc3 =
+  wuffs_private_impl__swizzle_ycc__upsample_func upfunc3 =
       (*upfuncs)[(inv_h3 - 1u) & 3u][(inv_v3 - 1u) & 3u];
 
   // First row.
   uint32_t h1v2_bias = 1u;
-  wuffs_base__pixel_swizzler__swizzle_ycck__general__triangle_filter_edge_row(
+  wuffs_private_impl__swizzle_ycck__general__triangle_filter_edge_row(
       dst, width, 0u,                          //
       src_ptr0, src_ptr1, src_ptr2, src_ptr3,  //
       stride0, stride1, stride2, stride3,      //
@@ -25627,7 +27940,7 @@
 
   // Last row.
   if (y_max_excl != height) {
-    wuffs_base__pixel_swizzler__swizzle_ycck__general__triangle_filter_edge_row(
+    wuffs_private_impl__swizzle_ycck__general__triangle_filter_edge_row(
         dst, width, height - 1u,                 //
         src_ptr0, src_ptr1, src_ptr2, src_ptr3,  //
         stride0, stride1, stride2, stride3,      //
@@ -25641,7 +27954,7 @@
 }
 
 static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row(
+wuffs_private_impl__swizzle_ycc__general__triangle_filter_edge_row(
     wuffs_base__pixel_buffer* dst,
     uint32_t width,
     uint32_t y,
@@ -25660,10 +27973,10 @@
     uint32_t half_width_for_2to1,
     uint32_t h1v2_bias,
     uint8_t* scratch_buffer_2k_ptr,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2,
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) {
+    wuffs_private_impl__swizzle_ycc__upsample_func upfunc0,
+    wuffs_private_impl__swizzle_ycc__upsample_func upfunc1,
+    wuffs_private_impl__swizzle_ycc__upsample_func upfunc2,
+    wuffs_private_impl__swizzle_ycc__convert_3_func conv3func) {
   const uint8_t* src0 = src_ptr0 + ((y / inv_v0) * (size_t)stride0);
   const uint8_t* src1 = src_ptr1 + ((y / inv_v1) * (size_t)stride1);
   const uint8_t* src2 = src_ptr2 + ((y / inv_v2) * (size_t)stride2);
@@ -25722,7 +28035,7 @@
 }
 
 static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter(
+wuffs_private_impl__swizzle_ycc__general__triangle_filter(
     wuffs_base__pixel_buffer* dst,
     uint32_t width,
     uint32_t height,
@@ -25741,18 +28054,18 @@
     uint32_t half_width_for_2to1,
     uint32_t half_height_for_2to1,
     uint8_t* scratch_buffer_2k_ptr,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func (*upfuncs)[4][4],
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) {
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 =
+    wuffs_private_impl__swizzle_ycc__upsample_func (*upfuncs)[4][4],
+    wuffs_private_impl__swizzle_ycc__convert_3_func conv3func) {
+  wuffs_private_impl__swizzle_ycc__upsample_func upfunc0 =
       (*upfuncs)[(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u];
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1 =
+  wuffs_private_impl__swizzle_ycc__upsample_func upfunc1 =
       (*upfuncs)[(inv_h1 - 1u) & 3u][(inv_v1 - 1u) & 3u];
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2 =
+  wuffs_private_impl__swizzle_ycc__upsample_func upfunc2 =
       (*upfuncs)[(inv_h2 - 1u) & 3u][(inv_v2 - 1u) & 3u];
 
   // First row.
   uint32_t h1v2_bias = 1u;
-  wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row(
+  wuffs_private_impl__swizzle_ycc__general__triangle_filter_edge_row(
       dst, width, 0u,                //
       src_ptr0, src_ptr1, src_ptr2,  //
       stride0, stride1, stride2,     //
@@ -25839,7 +28152,7 @@
 
   // Last row.
   if (y_max_excl != height) {
-    wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter_edge_row(
+    wuffs_private_impl__swizzle_ycc__general__triangle_filter_edge_row(
         dst, width, height - 1u,       //
         src_ptr0, src_ptr1, src_ptr2,  //
         stride0, stride1, stride2,     //
@@ -25853,7 +28166,7 @@
 }
 
 static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter(
+wuffs_private_impl__swizzle_ycc__general__box_filter(
     wuffs_base__pixel_buffer* dst,
     uint32_t width,
     uint32_t height,
@@ -25872,13 +28185,13 @@
     uint32_t half_width_for_2to1,
     uint32_t half_height_for_2to1,
     uint8_t* scratch_buffer_2k_ptr,
-    wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func (*upfuncs)[4][4],
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) {
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc0 =
+    wuffs_private_impl__swizzle_ycc__upsample_func (*upfuncs)[4][4],
+    wuffs_private_impl__swizzle_ycc__convert_3_func conv3func) {
+  wuffs_private_impl__swizzle_ycc__upsample_func upfunc0 =
       (*upfuncs)[(inv_h0 - 1u) & 3u][(inv_v0 - 1u) & 3u];
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc1 =
+  wuffs_private_impl__swizzle_ycc__upsample_func upfunc1 =
       (*upfuncs)[(inv_h1 - 1u) & 3u][(inv_v1 - 1u) & 3u];
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfunc2 =
+  wuffs_private_impl__swizzle_ycc__upsample_func upfunc2 =
       (*upfuncs)[(inv_h2 - 1u) & 3u][(inv_v2 - 1u) & 3u];
 
   uint32_t y;
@@ -25927,11 +28240,11 @@
 
 // --------
 
-// wuffs_base__pixel_swizzler__flattened_length is like
+// wuffs_private_impl__swizzle_flattened_length is like
 // wuffs_base__table__flattened_length but returns uint64_t (not size_t) and
 // also accounts for subsampling.
 static uint64_t  //
-wuffs_base__pixel_swizzler__flattened_length(uint32_t width,
+wuffs_private_impl__swizzle_flattened_length(uint32_t width,
                                              uint32_t height,
                                              uint32_t stride,
                                              uint32_t inv_h,
@@ -25997,8 +28310,8 @@
     }
   }
 
-  uint32_t max_incl_h = wuffs_base__u32__max_of_4(h0, h1, h2, h3);
-  uint32_t max_incl_v = wuffs_base__u32__max_of_4(v0, v1, v2, v3);
+  uint32_t max_incl_h = wuffs_private_impl__u32__max_of_4(h0, h1, h2, h3);
+  uint32_t max_incl_v = wuffs_private_impl__u32__max_of_4(v0, v1, v2, v3);
 
   // Calculate the inverse h and v ratios.
   //
@@ -26016,17 +28329,17 @@
   uint32_t half_width_for_2to1 = (width + 1u) / 2u;
   uint32_t half_height_for_2to1 = (height + 1u) / 2u;
 
-  width = wuffs_base__u32__min_of_5(  //
-      width,                          //
-      width0 * inv_h0,                //
-      width1 * inv_h1,                //
-      width2 * inv_h2,                //
+  width = wuffs_private_impl__u32__min_of_5(  //
+      width,                                  //
+      width0 * inv_h0,                        //
+      width1 * inv_h1,                        //
+      width2 * inv_h2,                        //
       wuffs_base__pixel_config__width(&dst->pixcfg));
-  height = wuffs_base__u32__min_of_5(  //
-      height,                          //
-      height0 * inv_v0,                //
-      height1 * inv_v1,                //
-      height2 * inv_v2,                //
+  height = wuffs_private_impl__u32__min_of_5(  //
+      height,                                  //
+      height0 * inv_v0,                        //
+      height1 * inv_v1,                        //
+      height2 * inv_v2,                        //
       wuffs_base__pixel_config__height(&dst->pixcfg));
 
   if (((h0 * inv_h0) != max_incl_h) ||  //
@@ -26035,18 +28348,18 @@
       ((v0 * inv_v0) != max_incl_v) ||  //
       ((v1 * inv_v1) != max_incl_v) ||  //
       ((v2 * inv_v2) != max_incl_v) ||  //
-      (src0.len < wuffs_base__pixel_swizzler__flattened_length(
+      (src0.len < wuffs_private_impl__swizzle_flattened_length(
                       width, height, stride0, inv_h0, inv_v0)) ||
-      (src1.len < wuffs_base__pixel_swizzler__flattened_length(
+      (src1.len < wuffs_private_impl__swizzle_flattened_length(
                       width, height, stride1, inv_h1, inv_v1)) ||
-      (src2.len < wuffs_base__pixel_swizzler__flattened_length(
+      (src2.len < wuffs_private_impl__swizzle_flattened_length(
                       width, height, stride2, inv_h2, inv_v2))) {
     return wuffs_base__make_status(wuffs_base__error__bad_argument);
   }
   if ((h3 != 0u) || (v3 != 0u)) {
     if (((h3 * inv_h3) != max_incl_h) ||  //
         ((v3 * inv_v3) != max_incl_v) ||  //
-        (src3.len < wuffs_base__pixel_swizzler__flattened_length(
+        (src3.len < wuffs_private_impl__swizzle_flattened_length(
                         width, height, stride3, inv_h3, inv_v3))) {
       return wuffs_base__make_status(wuffs_base__error__bad_argument);
     }
@@ -26058,10 +28371,52 @@
         wuffs_base__error__unsupported_pixel_swizzler_option);
   }
 
+  // ----
+
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ENABLE_ALLOWLIST)
+  switch (dst->pixcfg.private_impl.pixfmt.repr) {
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_BGR_565)
+    case WUFFS_BASE__PIXEL_FORMAT__BGR_565:
+      break;
+#endif
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_BGR)
+    case WUFFS_BASE__PIXEL_FORMAT__BGR:
+      break;
+#endif
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_BGRA_NONPREMUL)
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
+      break;
+#endif
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_BGRA_NONPREMUL_4X16LE)
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL_4X16LE:
+      break;
+#endif
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_BGRA_PREMUL)
+    case WUFFS_BASE__PIXEL_FORMAT__BGRA_PREMUL:
+      break;
+#endif
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_RGB)
+    case WUFFS_BASE__PIXEL_FORMAT__RGB:
+      break;
+#endif
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_RGBA_NONPREMUL)
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
+      break;
+#endif
+#if defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ALLOW_RGBA_PREMUL)
+    case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
+      break;
+#endif
+    default:
+      return wuffs_base__make_status(
+          wuffs_base__error__disabled_by_wuffs_config_dst_pixel_format_enable_allowlist);
+  }
+#else   // defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ENABLE_ALLOWLIST)
   switch (dst->pixcfg.private_impl.pixfmt.repr) {
     case WUFFS_BASE__PIXEL_FORMAT__Y:
     case WUFFS_BASE__PIXEL_FORMAT__Y_16LE:
     case WUFFS_BASE__PIXEL_FORMAT__Y_16BE:
+    case WUFFS_BASE__PIXEL_FORMAT__YA_NONPREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_NONPREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_PREMUL:
     case WUFFS_BASE__PIXEL_FORMAT__INDEXED__BGRA_BINARY:
@@ -26082,15 +28437,18 @@
       return wuffs_base__make_status(
           wuffs_base__error__unsupported_pixel_swizzler_option);
   }
+#endif  // defined(WUFFS_CONFIG__DST_PIXEL_FORMAT__ENABLE_ALLOWLIST)
+
+  // ----
 
   if ((width <= 0u) || (height <= 0u)) {
     return wuffs_base__make_status(NULL);
   }
 
-  wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func = NULL;
+  wuffs_private_impl__swizzle_ycc__convert_3_func conv3func = NULL;
 
   if (is_rgb_or_cmyk) {
-    conv3func = &wuffs_base__pixel_swizzler__swizzle_rgb__convert_3_general;
+    conv3func = &wuffs_private_impl__swizzle_rgb__convert_3_general;
   } else {
     switch (dst->pixcfg.private_impl.pixfmt.repr) {
       case WUFFS_BASE__PIXEL_FORMAT__BGRA_NONPREMUL:
@@ -26098,70 +28456,64 @@
       case WUFFS_BASE__PIXEL_FORMAT__BGRX:
 #if defined(WUFFS_BASE__CPU_ARCH__X86_64)
         if (wuffs_base__cpu_arch__have_x86_avx2()) {
-          conv3func =
-              &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx_x86_avx2;
+          conv3func = &wuffs_private_impl__swizzle_ycc__convert_3_bgrx_x86_avx2;
           break;
         }
 #endif
-        conv3func = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx;
+        conv3func = &wuffs_private_impl__swizzle_ycc__convert_3_bgrx;
         break;
       case WUFFS_BASE__PIXEL_FORMAT__RGBA_NONPREMUL:
       case WUFFS_BASE__PIXEL_FORMAT__RGBA_PREMUL:
       case WUFFS_BASE__PIXEL_FORMAT__RGBX:
 #if defined(WUFFS_BASE__CPU_ARCH__X86_64)
         if (wuffs_base__cpu_arch__have_x86_avx2()) {
-          conv3func =
-              &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx_x86_avx2;
+          conv3func = &wuffs_private_impl__swizzle_ycc__convert_3_rgbx_x86_avx2;
           break;
         }
 #endif
-        conv3func = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx;
+        conv3func = &wuffs_private_impl__swizzle_ycc__convert_3_rgbx;
         break;
       default:
-        conv3func = &wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_general;
+        conv3func = &wuffs_private_impl__swizzle_ycc__convert_3_general;
         break;
     }
   }
 
-  void (*func)(
-      wuffs_base__pixel_buffer * dst,  //
-      uint32_t width,                  //
-      uint32_t height,                 //
-      const uint8_t* src_ptr0,         //
-      const uint8_t* src_ptr1,         //
-      const uint8_t* src_ptr2,         //
-      uint32_t stride0,                //
-      uint32_t stride1,                //
-      uint32_t stride2,                //
-      uint32_t inv_h0,                 //
-      uint32_t inv_h1,                 //
-      uint32_t inv_h2,                 //
-      uint32_t inv_v0,                 //
-      uint32_t inv_v1,                 //
-      uint32_t inv_v2,                 //
-      uint32_t half_width_for_2to1,    //
-      uint32_t half_height_for_2to1,   //
-      uint8_t* scratch_buffer_2k_ptr,  //
-      wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func(*upfuncs)[4][4],
-      wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_func conv3func) =
-      &wuffs_base__pixel_swizzler__swizzle_ycc__general__box_filter;
+  void (*func)(wuffs_base__pixel_buffer * dst,  //
+               uint32_t width,                  //
+               uint32_t height,                 //
+               const uint8_t* src_ptr0,         //
+               const uint8_t* src_ptr1,         //
+               const uint8_t* src_ptr2,         //
+               uint32_t stride0,                //
+               uint32_t stride1,                //
+               uint32_t stride2,                //
+               uint32_t inv_h0,                 //
+               uint32_t inv_h1,                 //
+               uint32_t inv_h2,                 //
+               uint32_t inv_v0,                 //
+               uint32_t inv_v1,                 //
+               uint32_t inv_v2,                 //
+               uint32_t half_width_for_2to1,    //
+               uint32_t half_height_for_2to1,   //
+               uint8_t* scratch_buffer_2k_ptr,  //
+               wuffs_private_impl__swizzle_ycc__upsample_func(*upfuncs)[4][4],
+               wuffs_private_impl__swizzle_ycc__convert_3_func conv3func) =
+      &wuffs_private_impl__swizzle_ycc__general__box_filter;
 
-  wuffs_base__pixel_swizzler__swizzle_ycc__upsample_func upfuncs[4][4];
-  memcpy(&upfuncs, &wuffs_base__pixel_swizzler__swizzle_ycc__upsample_funcs,
+  wuffs_private_impl__swizzle_ycc__upsample_func upfuncs[4][4];
+  memcpy(&upfuncs, &wuffs_private_impl__swizzle_ycc__upsample_funcs,
          sizeof upfuncs);
 
   if (triangle_filter_for_2to1 &&
-      (wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h0, inv_v0) ||
-       wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h1, inv_v1) ||
-       wuffs_base__pixel_swizzler__has_triangle_upsampler(inv_h2, inv_v2))) {
-    func = &wuffs_base__pixel_swizzler__swizzle_ycc__general__triangle_filter;
+      (wuffs_private_impl__swizzle_has_triangle_upsampler(inv_h0, inv_v0) ||
+       wuffs_private_impl__swizzle_has_triangle_upsampler(inv_h1, inv_v1) ||
+       wuffs_private_impl__swizzle_has_triangle_upsampler(inv_h2, inv_v2))) {
+    func = &wuffs_private_impl__swizzle_ycc__general__triangle_filter;
 
-    upfuncs[0][1] =
-        wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h1v2_triangle;
-    upfuncs[1][0] =
-        wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v1_triangle;
-    upfuncs[1][1] =
-        wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v2_triangle;
+    upfuncs[0][1] = wuffs_private_impl__swizzle_ycc__upsample_inv_h1v2_triangle;
+    upfuncs[1][0] = wuffs_private_impl__swizzle_ycc__upsample_inv_h2v1_triangle;
+    upfuncs[1][1] = wuffs_private_impl__swizzle_ycc__upsample_inv_h2v2_triangle;
 
 #if defined(WUFFS_BASE__CPU_ARCH__X86_64)
 #if defined(__GNUC__) && !defined(__clang__)
@@ -26179,24 +28531,23 @@
 #else
     if (wuffs_base__cpu_arch__have_x86_avx2()) {
       upfuncs[1][1] =
-          wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v2_triangle_x86_avx2;
+          wuffs_private_impl__swizzle_ycc__upsample_inv_h2v2_triangle_x86_avx2;
     }
 #endif
 #endif
   }
 
   if ((h3 != 0u) || (v3 != 0u)) {
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_4_func conv4func =
-        is_rgb_or_cmyk
-            ? &wuffs_base__pixel_swizzler__swizzle_cmyk__convert_4_general
-            : &wuffs_base__pixel_swizzler__swizzle_ycck__convert_4_general;
-    wuffs_base__pixel_swizzler__swizzle_ycck__general__triangle_filter(  //
-        dst, width, height,                                              //
-        src0.ptr, src1.ptr, src2.ptr, src3.ptr,                          //
-        stride0, stride1, stride2, stride3,                              //
-        inv_h0, inv_h1, inv_h2, inv_h3,                                  //
-        inv_v0, inv_v1, inv_v2, inv_v3,                                  //
-        half_width_for_2to1, half_height_for_2to1,                       //
+    wuffs_private_impl__swizzle_ycc__convert_4_func conv4func =
+        is_rgb_or_cmyk ? &wuffs_private_impl__swizzle_cmyk__convert_4_general
+                       : &wuffs_private_impl__swizzle_ycck__convert_4_general;
+    wuffs_private_impl__swizzle_ycck__general__triangle_filter(  //
+        dst, width, height,                                      //
+        src0.ptr, src1.ptr, src2.ptr, src3.ptr,                  //
+        stride0, stride1, stride2, stride3,                      //
+        inv_h0, inv_h1, inv_h2, inv_h3,                          //
+        inv_v0, inv_v1, inv_v2, inv_v3,                          //
+        half_width_for_2to1, half_height_for_2to1,               //
         scratch_buffer_2k.ptr, &upfuncs, conv4func);
 
   } else {
@@ -26219,7 +28570,7 @@
 #if defined(WUFFS_BASE__CPU_ARCH__X86_64)
 WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2")
 static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx_x86_avx2(
+wuffs_private_impl__swizzle_ycc__convert_3_bgrx_x86_avx2(
     wuffs_base__pixel_buffer* dst,
     uint32_t x,
     uint32_t x_end,
@@ -26228,7 +28579,7 @@
     const uint8_t* up1,
     const uint8_t* up2) {
   if ((x + 32u) > x_end) {
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx(  //
+    wuffs_private_impl__swizzle_ycc__convert_3_bgrx(  //
         dst, x, x_end, y, up0, up1, up2);
     return;
   }
@@ -26492,7 +28843,7 @@
 // except for the lines marked with a § and that comments were stripped.
 WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2")
 static void  //
-wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_rgbx_x86_avx2(
+wuffs_private_impl__swizzle_ycc__convert_3_rgbx_x86_avx2(
     wuffs_base__pixel_buffer* dst,
     uint32_t x,
     uint32_t x_end,
@@ -26501,7 +28852,7 @@
     const uint8_t* up1,
     const uint8_t* up2) {
   if ((x + 32u) > x_end) {
-    wuffs_base__pixel_swizzler__swizzle_ycc__convert_3_bgrx(  //
+    wuffs_private_impl__swizzle_ycc__convert_3_bgrx(  //
         dst, x, x_end, y, up0, up1, up2);
     return;
   }
@@ -26643,7 +28994,7 @@
 #else
 WUFFS_BASE__MAYBE_ATTRIBUTE_TARGET("pclmul,popcnt,sse4.2,avx2")
 static const uint8_t*  //
-wuffs_base__pixel_swizzler__swizzle_ycc__upsample_inv_h2v2_triangle_x86_avx2(
+wuffs_private_impl__swizzle_ycc__upsample_inv_h2v2_triangle_x86_avx2(
     uint8_t* dst_ptr,
     const uint8_t* src_ptr_major,
     const uint8_t* src_ptr_minor,
@@ -27594,33 +29945,33 @@
 
 // ---------------- Private Consts
 
-#define WUFFS_BMP__COMPRESSION_NONE 0
+#define WUFFS_BMP__COMPRESSION_NONE 0u
 
-#define WUFFS_BMP__COMPRESSION_RLE8 1
+#define WUFFS_BMP__COMPRESSION_RLE8 1u
 
-#define WUFFS_BMP__COMPRESSION_RLE4 2
+#define WUFFS_BMP__COMPRESSION_RLE4 2u
 
-#define WUFFS_BMP__COMPRESSION_BITFIELDS 3
+#define WUFFS_BMP__COMPRESSION_BITFIELDS 3u
 
-#define WUFFS_BMP__COMPRESSION_JPEG 4
+#define WUFFS_BMP__COMPRESSION_JPEG 4u
 
-#define WUFFS_BMP__COMPRESSION_PNG 5
+#define WUFFS_BMP__COMPRESSION_PNG 5u
 
-#define WUFFS_BMP__COMPRESSION_ALPHABITFIELDS 6
+#define WUFFS_BMP__COMPRESSION_ALPHABITFIELDS 6u
 
-#define WUFFS_BMP__COMPRESSION_LOW_BIT_DEPTH 256
+#define WUFFS_BMP__COMPRESSION_LOW_BIT_DEPTH 256u
 
-#define WUFFS_BMP__RLE_STATE_NEUTRAL 0
+#define WUFFS_BMP__RLE_STATE_NEUTRAL 0u
 
-#define WUFFS_BMP__RLE_STATE_RUN 1
+#define WUFFS_BMP__RLE_STATE_RUN 1u
 
-#define WUFFS_BMP__RLE_STATE_ESCAPE 2
+#define WUFFS_BMP__RLE_STATE_ESCAPE 2u
 
-#define WUFFS_BMP__RLE_STATE_LITERAL 3
+#define WUFFS_BMP__RLE_STATE_LITERAL 3u
 
-#define WUFFS_BMP__RLE_STATE_DELTA_X 4
+#define WUFFS_BMP__RLE_STATE_DELTA_X 4u
 
-#define WUFFS_BMP__RLE_STATE_DELTA_Y 5
+#define WUFFS_BMP__RLE_STATE_DELTA_Y 5u
 
 // ---------------- Private Initializer Prototypes
 
@@ -27716,7 +30067,6 @@
   (wuffs_base__rect_ie_u32(*)(const void*))(&wuffs_bmp__decoder__frame_dirty_rect),
   (uint64_t(*)(const void*,
       uint32_t))(&wuffs_bmp__decoder__get_quirk),
-  (uint64_t(*)(const void*))(&wuffs_bmp__decoder__history_retain_length),
   (uint32_t(*)(const void*))(&wuffs_bmp__decoder__num_animation_loops),
   (uint64_t(*)(const void*))(&wuffs_bmp__decoder__num_decoded_frame_configs),
   (uint64_t(*)(const void*))(&wuffs_bmp__decoder__num_decoded_frames),
@@ -27877,7 +30227,7 @@
 
   wuffs_base__status v_status = wuffs_base__make_status(NULL);
 
-  uint32_t coro_susp_point = self->private_impl.p_decode_image_config[0];
+  uint32_t coro_susp_point = self->private_impl.p_decode_image_config;
   switch (coro_susp_point) {
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
 
@@ -27895,13 +30245,13 @@
     }
 
     ok:
-    self->private_impl.p_decode_image_config[0] = 0;
+    self->private_impl.p_decode_image_config = 0;
     goto exit;
   }
 
   goto suspend;
   suspend:
-  self->private_impl.p_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
+  self->private_impl.p_decode_image_config = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
   self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
 
   goto exit;
@@ -27940,7 +30290,7 @@
     io2_a_src = io0_a_src + a_src->meta.wi;
   }
 
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_image_config[0];
+  uint32_t coro_susp_point = self->private_impl.p_do_decode_image_config;
   switch (coro_susp_point) {
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
 
@@ -27958,14 +30308,14 @@
         t_0 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
         iop_a_src += 2;
       } else {
-        self->private_data.s_do_decode_image_config[0].scratch = 0;
+        self->private_data.s_do_decode_image_config.scratch = 0;
         WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
         while (true) {
           if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
             status = wuffs_base__make_status(wuffs_base__suspension__short_read);
             goto suspend;
           }
-          uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+          uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
           uint32_t num_bits_0 = ((uint32_t)(*scratch >> 56));
           *scratch <<= 8;
           *scratch >>= 8;
@@ -27984,15 +30334,15 @@
       status = wuffs_base__make_status(wuffs_bmp__error__bad_header);
       goto exit;
     }
-    self->private_data.s_do_decode_image_config[0].scratch = 8u;
+    self->private_data.s_do_decode_image_config.scratch = 8u;
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT(3);
-    if (self->private_data.s_do_decode_image_config[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-      self->private_data.s_do_decode_image_config[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
+    if (self->private_data.s_do_decode_image_config.scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
+      self->private_data.s_do_decode_image_config.scratch -= ((uint64_t)(io2_a_src - iop_a_src));
       iop_a_src = io2_a_src;
       status = wuffs_base__make_status(wuffs_base__suspension__short_read);
       goto suspend;
     }
-    iop_a_src += self->private_data.s_do_decode_image_config[0].scratch;
+    iop_a_src += self->private_data.s_do_decode_image_config.scratch;
     {
       WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
       uint32_t t_1;
@@ -28000,14 +30350,14 @@
         t_1 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
         iop_a_src += 4;
       } else {
-        self->private_data.s_do_decode_image_config[0].scratch = 0;
+        self->private_data.s_do_decode_image_config.scratch = 0;
         WUFFS_BASE__COROUTINE_SUSPENSION_POINT(5);
         while (true) {
           if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
             status = wuffs_base__make_status(wuffs_base__suspension__short_read);
             goto suspend;
           }
-          uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+          uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
           uint32_t num_bits_1 = ((uint32_t)(*scratch >> 56));
           *scratch <<= 8;
           *scratch >>= 8;
@@ -28035,14 +30385,14 @@
         t_2 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
         iop_a_src += 4;
       } else {
-        self->private_data.s_do_decode_image_config[0].scratch = 0;
+        self->private_data.s_do_decode_image_config.scratch = 0;
         WUFFS_BASE__COROUTINE_SUSPENSION_POINT(7);
         while (true) {
           if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
             status = wuffs_base__make_status(wuffs_base__suspension__short_read);
             goto suspend;
           }
-          uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+          uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
           uint32_t num_bits_2 = ((uint32_t)(*scratch >> 56));
           *scratch <<= 8;
           *scratch >>= 8;
@@ -28070,14 +30420,14 @@
           t_3 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
           iop_a_src += 2;
         } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
+          self->private_data.s_do_decode_image_config.scratch = 0;
           WUFFS_BASE__COROUTINE_SUSPENSION_POINT(9);
           while (true) {
             if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
               status = wuffs_base__make_status(wuffs_base__suspension__short_read);
               goto suspend;
             }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+            uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
             uint32_t num_bits_3 = ((uint32_t)(*scratch >> 56));
             *scratch <<= 8;
             *scratch >>= 8;
@@ -28099,14 +30449,14 @@
           t_4 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
           iop_a_src += 2;
         } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
+          self->private_data.s_do_decode_image_config.scratch = 0;
           WUFFS_BASE__COROUTINE_SUSPENSION_POINT(11);
           while (true) {
             if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
               status = wuffs_base__make_status(wuffs_base__suspension__short_read);
               goto suspend;
             }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+            uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
             uint32_t num_bits_4 = ((uint32_t)(*scratch >> 56));
             *scratch <<= 8;
             *scratch >>= 8;
@@ -28128,14 +30478,14 @@
           t_5 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
           iop_a_src += 2;
         } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
+          self->private_data.s_do_decode_image_config.scratch = 0;
           WUFFS_BASE__COROUTINE_SUSPENSION_POINT(13);
           while (true) {
             if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
               status = wuffs_base__make_status(wuffs_base__suspension__short_read);
               goto suspend;
             }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+            uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
             uint32_t num_bits_5 = ((uint32_t)(*scratch >> 56));
             *scratch <<= 8;
             *scratch >>= 8;
@@ -28161,14 +30511,14 @@
           t_6 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
           iop_a_src += 2;
         } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
+          self->private_data.s_do_decode_image_config.scratch = 0;
           WUFFS_BASE__COROUTINE_SUSPENSION_POINT(15);
           while (true) {
             if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
               status = wuffs_base__make_status(wuffs_base__suspension__short_read);
               goto suspend;
             }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+            uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
             uint32_t num_bits_6 = ((uint32_t)(*scratch >> 56));
             *scratch <<= 8;
             *scratch >>= 8;
@@ -28191,14 +30541,14 @@
           t_7 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
           iop_a_src += 4;
         } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
+          self->private_data.s_do_decode_image_config.scratch = 0;
           WUFFS_BASE__COROUTINE_SUSPENSION_POINT(17);
           while (true) {
             if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
               status = wuffs_base__make_status(wuffs_base__suspension__short_read);
               goto suspend;
             }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+            uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
             uint32_t num_bits_7 = ((uint32_t)(*scratch >> 56));
             *scratch <<= 8;
             *scratch >>= 8;
@@ -28228,14 +30578,14 @@
           t_8 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
           iop_a_src += 4;
         } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
+          self->private_data.s_do_decode_image_config.scratch = 0;
           WUFFS_BASE__COROUTINE_SUSPENSION_POINT(19);
           while (true) {
             if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
               status = wuffs_base__make_status(wuffs_base__suspension__short_read);
               goto suspend;
             }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+            uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
             uint32_t num_bits_8 = ((uint32_t)(*scratch >> 56));
             *scratch <<= 8;
             *scratch >>= 8;
@@ -28265,14 +30615,14 @@
           t_9 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
           iop_a_src += 2;
         } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
+          self->private_data.s_do_decode_image_config.scratch = 0;
           WUFFS_BASE__COROUTINE_SUSPENSION_POINT(21);
           while (true) {
             if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
               status = wuffs_base__make_status(wuffs_base__suspension__short_read);
               goto suspend;
             }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+            uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
             uint32_t num_bits_9 = ((uint32_t)(*scratch >> 56));
             *scratch <<= 8;
             *scratch >>= 8;
@@ -28298,14 +30648,14 @@
           t_10 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
           iop_a_src += 2;
         } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
+          self->private_data.s_do_decode_image_config.scratch = 0;
           WUFFS_BASE__COROUTINE_SUSPENSION_POINT(23);
           while (true) {
             if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
               status = wuffs_base__make_status(wuffs_base__suspension__short_read);
               goto suspend;
             }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+            uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
             uint32_t num_bits_10 = ((uint32_t)(*scratch >> 56));
             *scratch <<= 8;
             *scratch >>= 8;
@@ -28328,14 +30678,14 @@
           t_11 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
           iop_a_src += 4;
         } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
+          self->private_data.s_do_decode_image_config.scratch = 0;
           WUFFS_BASE__COROUTINE_SUSPENSION_POINT(25);
           while (true) {
             if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
               status = wuffs_base__make_status(wuffs_base__suspension__short_read);
               goto suspend;
             }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+            uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
             uint32_t num_bits_11 = ((uint32_t)(*scratch >> 56));
             *scratch <<= 8;
             *scratch >>= 8;
@@ -28365,14 +30715,14 @@
           t_12 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
           iop_a_src += 4;
         } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
+          self->private_data.s_do_decode_image_config.scratch = 0;
           WUFFS_BASE__COROUTINE_SUSPENSION_POINT(27);
           while (true) {
             if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
               status = wuffs_base__make_status(wuffs_base__suspension__short_read);
               goto suspend;
             }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+            uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
             uint32_t num_bits_12 = ((uint32_t)(*scratch >> 56));
             *scratch <<= 8;
             *scratch >>= 8;
@@ -28411,14 +30761,14 @@
           t_13 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
           iop_a_src += 2;
         } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
+          self->private_data.s_do_decode_image_config.scratch = 0;
           WUFFS_BASE__COROUTINE_SUSPENSION_POINT(29);
           while (true) {
             if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
               status = wuffs_base__make_status(wuffs_base__suspension__short_read);
               goto suspend;
             }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+            uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
             uint32_t num_bits_13 = ((uint32_t)(*scratch >> 56));
             *scratch <<= 8;
             *scratch >>= 8;
@@ -28444,14 +30794,14 @@
           t_14 = ((uint32_t)(wuffs_base__peek_u16le__no_bounds_check(iop_a_src)));
           iop_a_src += 2;
         } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
+          self->private_data.s_do_decode_image_config.scratch = 0;
           WUFFS_BASE__COROUTINE_SUSPENSION_POINT(31);
           while (true) {
             if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
               status = wuffs_base__make_status(wuffs_base__suspension__short_read);
               goto suspend;
             }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+            uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
             uint32_t num_bits_14 = ((uint32_t)(*scratch >> 56));
             *scratch <<= 8;
             *scratch >>= 8;
@@ -28473,14 +30823,14 @@
           t_15 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
           iop_a_src += 4;
         } else {
-          self->private_data.s_do_decode_image_config[0].scratch = 0;
+          self->private_data.s_do_decode_image_config.scratch = 0;
           WUFFS_BASE__COROUTINE_SUSPENSION_POINT(33);
           while (true) {
             if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
               status = wuffs_base__make_status(wuffs_base__suspension__short_read);
               goto suspend;
             }
-            uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+            uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
             uint32_t num_bits_15 = ((uint32_t)(*scratch >> 56));
             *scratch <<= 8;
             *scratch >>= 8;
@@ -28508,15 +30858,15 @@
         status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
         goto exit;
       }
-      self->private_data.s_do_decode_image_config[0].scratch = 20u;
+      self->private_data.s_do_decode_image_config.scratch = 20u;
       WUFFS_BASE__COROUTINE_SUSPENSION_POINT(34);
-      if (self->private_data.s_do_decode_image_config[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-        self->private_data.s_do_decode_image_config[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
+      if (self->private_data.s_do_decode_image_config.scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
+        self->private_data.s_do_decode_image_config.scratch -= ((uint64_t)(io2_a_src - iop_a_src));
         iop_a_src = io2_a_src;
         status = wuffs_base__make_status(wuffs_base__suspension__short_read);
         goto suspend;
       }
-      iop_a_src += self->private_data.s_do_decode_image_config[0].scratch;
+      iop_a_src += self->private_data.s_do_decode_image_config.scratch;
       if (self->private_impl.f_bitmap_info_len == 40u) {
         if (self->private_impl.f_bits_per_pixel >= 16u) {
           if (self->private_impl.f_padding >= 16u) {
@@ -28547,14 +30897,14 @@
               t_16 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
               iop_a_src += 4;
             } else {
-              self->private_data.s_do_decode_image_config[0].scratch = 0;
+              self->private_data.s_do_decode_image_config.scratch = 0;
               WUFFS_BASE__COROUTINE_SUSPENSION_POINT(36);
               while (true) {
                 if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
                   status = wuffs_base__make_status(wuffs_base__suspension__short_read);
                   goto suspend;
                 }
-                uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+                uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
                 uint32_t num_bits_16 = ((uint32_t)(*scratch >> 56));
                 *scratch <<= 8;
                 *scratch >>= 8;
@@ -28576,14 +30926,14 @@
               t_17 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
               iop_a_src += 4;
             } else {
-              self->private_data.s_do_decode_image_config[0].scratch = 0;
+              self->private_data.s_do_decode_image_config.scratch = 0;
               WUFFS_BASE__COROUTINE_SUSPENSION_POINT(38);
               while (true) {
                 if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
                   status = wuffs_base__make_status(wuffs_base__suspension__short_read);
                   goto suspend;
                 }
-                uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+                uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
                 uint32_t num_bits_17 = ((uint32_t)(*scratch >> 56));
                 *scratch <<= 8;
                 *scratch >>= 8;
@@ -28605,14 +30955,14 @@
               t_18 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
               iop_a_src += 4;
             } else {
-              self->private_data.s_do_decode_image_config[0].scratch = 0;
+              self->private_data.s_do_decode_image_config.scratch = 0;
               WUFFS_BASE__COROUTINE_SUSPENSION_POINT(40);
               while (true) {
                 if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
                   status = wuffs_base__make_status(wuffs_base__suspension__short_read);
                   goto suspend;
                 }
-                uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+                uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
                 uint32_t num_bits_18 = ((uint32_t)(*scratch >> 56));
                 *scratch <<= 8;
                 *scratch >>= 8;
@@ -28635,14 +30985,14 @@
                 t_19 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
                 iop_a_src += 4;
               } else {
-                self->private_data.s_do_decode_image_config[0].scratch = 0;
+                self->private_data.s_do_decode_image_config.scratch = 0;
                 WUFFS_BASE__COROUTINE_SUSPENSION_POINT(42);
                 while (true) {
                   if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
                     status = wuffs_base__make_status(wuffs_base__suspension__short_read);
                     goto suspend;
                   }
-                  uint64_t* scratch = &self->private_data.s_do_decode_image_config[0].scratch;
+                  uint64_t* scratch = &self->private_data.s_do_decode_image_config.scratch;
                   uint32_t num_bits_19 = ((uint32_t)(*scratch >> 56));
                   *scratch <<= 8;
                   *scratch >>= 8;
@@ -28657,15 +31007,15 @@
               }
               self->private_impl.f_channel_masks[3u] = t_19;
             }
-            self->private_data.s_do_decode_image_config[0].scratch = ((uint32_t)(self->private_impl.f_bitmap_info_len - 56u));
+            self->private_data.s_do_decode_image_config.scratch = ((uint32_t)(self->private_impl.f_bitmap_info_len - 56u));
             WUFFS_BASE__COROUTINE_SUSPENSION_POINT(43);
-            if (self->private_data.s_do_decode_image_config[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-              self->private_data.s_do_decode_image_config[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
+            if (self->private_data.s_do_decode_image_config.scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
+              self->private_data.s_do_decode_image_config.scratch -= ((uint64_t)(io2_a_src - iop_a_src));
               iop_a_src = io2_a_src;
               status = wuffs_base__make_status(wuffs_base__suspension__short_read);
               goto suspend;
             }
-            iop_a_src += self->private_data.s_do_decode_image_config[0].scratch;
+            iop_a_src += self->private_data.s_do_decode_image_config.scratch;
           }
           if ((self->private_impl.f_channel_masks[0u] == 255u) && (self->private_impl.f_channel_masks[1u] == 65280u) && (self->private_impl.f_channel_masks[2u] == 16711680u)) {
             if (self->private_impl.f_bits_per_pixel == 24u) {
@@ -28683,15 +31033,15 @@
           }
         }
       } else if (self->private_impl.f_bitmap_info_len >= 40u) {
-        self->private_data.s_do_decode_image_config[0].scratch = (self->private_impl.f_bitmap_info_len - 40u);
+        self->private_data.s_do_decode_image_config.scratch = (self->private_impl.f_bitmap_info_len - 40u);
         WUFFS_BASE__COROUTINE_SUSPENSION_POINT(45);
-        if (self->private_data.s_do_decode_image_config[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-          self->private_data.s_do_decode_image_config[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
+        if (self->private_data.s_do_decode_image_config.scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
+          self->private_data.s_do_decode_image_config.scratch -= ((uint64_t)(io2_a_src - iop_a_src));
           iop_a_src = io2_a_src;
           status = wuffs_base__make_status(wuffs_base__suspension__short_read);
           goto suspend;
         }
-        iop_a_src += self->private_data.s_do_decode_image_config[0].scratch;
+        iop_a_src += self->private_data.s_do_decode_image_config.scratch;
       } else {
         status = wuffs_base__make_status(wuffs_bmp__error__unsupported_bmp_file);
         goto exit;
@@ -28814,13 +31164,13 @@
     self->private_impl.f_call_sequence = 32u;
 
     ok:
-    self->private_impl.p_do_decode_image_config[0] = 0;
+    self->private_impl.p_do_decode_image_config = 0;
     goto exit;
   }
 
   goto suspend;
   suspend:
-  self->private_impl.p_do_decode_image_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
+  self->private_impl.p_do_decode_image_config = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
 
   goto exit;
   exit:
@@ -28862,7 +31212,7 @@
 
   wuffs_base__status v_status = wuffs_base__make_status(NULL);
 
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame_config[0];
+  uint32_t coro_susp_point = self->private_impl.p_decode_frame_config;
   switch (coro_susp_point) {
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
 
@@ -28880,13 +31230,13 @@
     }
 
     ok:
-    self->private_impl.p_decode_frame_config[0] = 0;
+    self->private_impl.p_decode_frame_config = 0;
     goto exit;
   }
 
   goto suspend;
   suspend:
-  self->private_impl.p_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
+  self->private_impl.p_decode_frame_config = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
   self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 2 : 0;
 
   goto exit;
@@ -28918,7 +31268,7 @@
     io2_a_src = io0_a_src + a_src->meta.wi;
   }
 
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame_config[0];
+  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame_config;
   switch (coro_susp_point) {
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
 
@@ -28967,13 +31317,13 @@
     self->private_impl.f_call_sequence = 64u;
 
     ok:
-    self->private_impl.p_do_decode_frame_config[0] = 0;
+    self->private_impl.p_do_decode_frame_config = 0;
     goto exit;
   }
 
   goto suspend;
   suspend:
-  self->private_impl.p_do_decode_frame_config[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
+  self->private_impl.p_do_decode_frame_config = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
 
   goto exit;
   exit:
@@ -29018,7 +31368,7 @@
 
   wuffs_base__status v_status = wuffs_base__make_status(NULL);
 
-  uint32_t coro_susp_point = self->private_impl.p_decode_frame[0];
+  uint32_t coro_susp_point = self->private_impl.p_decode_frame;
   switch (coro_susp_point) {
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
 
@@ -29041,13 +31391,13 @@
     }
 
     ok:
-    self->private_impl.p_decode_frame[0] = 0;
+    self->private_impl.p_decode_frame = 0;
     goto exit;
   }
 
   goto suspend;
   suspend:
-  self->private_impl.p_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
+  self->private_impl.p_decode_frame = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
   self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 3 : 0;
 
   goto exit;
@@ -29084,7 +31434,7 @@
     io2_a_src = io0_a_src + a_src->meta.wi;
   }
 
-  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame[0];
+  uint32_t coro_susp_point = self->private_impl.p_do_decode_frame;
   switch (coro_susp_point) {
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
 
@@ -29105,15 +31455,15 @@
       status = wuffs_base__make_status(wuffs_base__note__end_of_data);
       goto ok;
     }
-    self->private_data.s_do_decode_frame[0].scratch = self->private_impl.f_padding;
+    self->private_data.s_do_decode_frame.scratch = self->private_impl.f_padding;
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
-    if (self->private_data.s_do_decode_frame[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-      self->private_data.s_do_decode_frame[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
+    if (self->private_data.s_do_decode_frame.scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
+      self->private_data.s_do_decode_frame.scratch -= ((uint64_t)(io2_a_src - iop_a_src));
       iop_a_src = io2_a_src;
       status = wuffs_base__make_status(wuffs_base__suspension__short_read);
       goto suspend;
     }
-    iop_a_src += self->private_data.s_do_decode_frame[0].scratch;
+    iop_a_src += self->private_data.s_do_decode_frame.scratch;
     if ((self->private_impl.f_width > 0u) && (self->private_impl.f_height > 0u)) {
       self->private_impl.f_dst_x = 0u;
       if (self->private_impl.f_top_down) {
@@ -29188,27 +31538,27 @@
         status = wuffs_base__make_status(wuffs_base__suspension__short_read);
         WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(3);
       }
-      self->private_data.s_do_decode_frame[0].scratch = self->private_impl.f_pending_pad;
+      self->private_data.s_do_decode_frame.scratch = self->private_impl.f_pending_pad;
       WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
-      if (self->private_data.s_do_decode_frame[0].scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
-        self->private_data.s_do_decode_frame[0].scratch -= ((uint64_t)(io2_a_src - iop_a_src));
+      if (self->private_data.s_do_decode_frame.scratch > ((uint64_t)(io2_a_src - iop_a_src))) {
+        self->private_data.s_do_decode_frame.scratch -= ((uint64_t)(io2_a_src - iop_a_src));
         iop_a_src = io2_a_src;
         status = wuffs_base__make_status(wuffs_base__suspension__short_read);
         goto suspend;
       }
-      iop_a_src += self->private_data.s_do_decode_frame[0].scratch;
+      iop_a_src += self->private_data.s_do_decode_frame.scratch;
       self->private_impl.f_pending_pad = 0u;
     }
     self->private_impl.f_call_sequence = 96u;
 
     ok:
-    self->private_impl.p_do_decode_frame[0] = 0;
+    self->private_impl.p_do_decode_frame = 0;
     goto exit;
   }
 
   goto suspend;
   suspend:
-  self->private_impl.p_do_decode_frame[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
+  self->private_impl.p_do_decode_frame = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
 
   goto exit;
   exit:
@@ -29286,7 +31636,7 @@
           goto label__outer__continue;
         }
       }
-      v_dst = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
+      v_dst = wuffs_private_impl__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
       if (v_dst_bytes_per_row < ((uint64_t)(v_dst.len))) {
         v_dst = wuffs_base__slice_u8__subslice_j(v_dst, v_dst_bytes_per_row);
       }
@@ -29328,7 +31678,7 @@
         status = wuffs_base__make_status(wuffs_bmp__note__internal_note_short_read);
         goto ok;
       }
-      wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
+      wuffs_private_impl__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
     }
   }
   label__outer__break:;
@@ -29396,7 +31746,7 @@
   v_rle_state = self->private_impl.f_rle_state;
   label__outer__continue:;
   while (true) {
-    v_row = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
+    v_row = wuffs_private_impl__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
     if (v_dst_bytes_per_row < ((uint64_t)(v_row.len))) {
       v_row = wuffs_base__slice_u8__subslice_j(v_row, v_dst_bytes_per_row);
     }
@@ -29436,8 +31786,8 @@
                 v_p0 += 1u;
               }
             } else {
-              v_indexes[0u] = ((uint8_t)((v_code >> 4u)));
-              v_indexes[1u] = (v_code & 15u);
+              v_indexes[0u] = ((uint8_t)(((uint8_t)(v_code >> 4u))));
+              v_indexes[1u] = ((uint8_t)(v_code & 15u));
               v_p0 = 0u;
               while (v_p0 < self->private_impl.f_rle_length) {
                 self->private_data.f_scratch[(v_p0 + 0u)] = v_indexes[0u];
@@ -29446,7 +31796,7 @@
               }
             }
             wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, v_dst, v_dst_palette, wuffs_base__make_slice_u8(self->private_data.f_scratch, self->private_impl.f_rle_length));
-            wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, self->private_impl.f_rle_length);
+            wuffs_private_impl__u32__sat_add_indirect(&self->private_impl.f_dst_x, self->private_impl.f_rle_length);
             v_rle_state = 0u;
             goto label__middle__continue;
           } else if (v_rle_state == 2u) {
@@ -29473,7 +31823,7 @@
               continue;
             }
             self->private_impl.f_rle_length = ((uint32_t)(v_code));
-            self->private_impl.f_rle_padded = ((self->private_impl.f_bits_per_pixel == 8u) && ((v_code & 1u) != 0u));
+            self->private_impl.f_rle_padded = ((self->private_impl.f_bits_per_pixel == 8u) && (((uint8_t)(v_code & 1u)) != 0u));
             v_rle_state = 3u;
             continue;
           } else if (v_rle_state == 3u) {
@@ -29485,8 +31835,8 @@
                   v_dst_palette,
                   &iop_a_src,
                   io2_a_src);
-              wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
-              wuffs_base__u32__sat_sub_indirect(&self->private_impl.f_rle_length, ((uint32_t)(v_n)));
+              wuffs_private_impl__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
+              wuffs_private_impl__u32__sat_sub_indirect(&self->private_impl.f_rle_length, ((uint32_t)(v_n)));
             } else {
               v_chunk_count = ((self->private_impl.f_rle_length + 3u) / 4u);
               v_p0 = 0u;
@@ -29502,8 +31852,8 @@
               }
               v_p0 = wuffs_base__u32__min(v_p0, self->private_impl.f_rle_length);
               wuffs_base__pixel_swizzler__swizzle_interleaved_from_slice(&self->private_impl.f_swizzler, v_dst, v_dst_palette, wuffs_base__make_slice_u8(self->private_data.f_scratch, v_p0));
-              wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, v_p0);
-              wuffs_base__u32__sat_sub_indirect(&self->private_impl.f_rle_length, v_p0);
+              wuffs_private_impl__u32__sat_add_indirect(&self->private_impl.f_dst_x, v_p0);
+              wuffs_private_impl__u32__sat_sub_indirect(&self->private_impl.f_rle_length, v_p0);
             }
             if (self->private_impl.f_rle_length > 0u) {
               goto label__goto_suspend__break;
@@ -29533,7 +31883,7 @@
           iop_a_src += 1u;
           if (self->private_impl.f_rle_delta_x > 0u) {
             wuffs_base__pixel_swizzler__swizzle_interleaved_transparent_black(&self->private_impl.f_swizzler, v_dst, v_dst_palette, ((uint64_t)(self->private_impl.f_rle_delta_x)));
-            wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(self->private_impl.f_rle_delta_x)));
+            wuffs_private_impl__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(self->private_impl.f_rle_delta_x)));
             self->private_impl.f_rle_delta_x = 0u;
             if (self->private_impl.f_dst_x > self->private_impl.f_width) {
               status = wuffs_base__make_status(wuffs_bmp__error__bad_rle_compression);
@@ -29555,7 +31905,7 @@
                 status = wuffs_base__make_status(wuffs_bmp__error__bad_rle_compression);
                 goto exit;
               }
-              v_row = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
+              v_row = wuffs_private_impl__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
               if (v_dst_bytes_per_row < ((uint64_t)(v_row.len))) {
                 v_row = wuffs_base__slice_u8__subslice_j(v_row, v_dst_bytes_per_row);
               }
@@ -29586,7 +31936,7 @@
   }
   label__outer__break:;
   while (self->private_impl.f_dst_y < self->private_impl.f_height) {
-    v_row = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
+    v_row = wuffs_private_impl__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
     if (v_dst_bytes_per_row < ((uint64_t)(v_row.len))) {
       v_row = wuffs_base__slice_u8__subslice_j(v_row, v_dst_bytes_per_row);
     }
@@ -29715,7 +32065,7 @@
         }
         v_p0 += 1u;
       }
-      v_dst = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
+      v_dst = wuffs_private_impl__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
       if (v_dst_bytes_per_row < ((uint64_t)(v_dst.len))) {
         v_dst = wuffs_base__slice_u8__subslice_j(v_dst, v_dst_bytes_per_row);
       }
@@ -29729,7 +32079,7 @@
         status = wuffs_base__make_status(wuffs_bmp__note__internal_note_short_read);
         goto ok;
       }
-      wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
+      wuffs_private_impl__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
     }
   }
   label__outer__break:;
@@ -29799,7 +32149,7 @@
         break;
       }
     }
-    v_dst = wuffs_base__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
+    v_dst = wuffs_private_impl__table_u8__row_u32(v_tab, self->private_impl.f_dst_y);
     if (v_dst_bytes_per_row < ((uint64_t)(v_dst.len))) {
       v_dst = wuffs_base__slice_u8__subslice_j(v_dst, v_dst_bytes_per_row);
     }
@@ -29928,7 +32278,7 @@
       status = wuffs_base__make_status(wuffs_bmp__note__internal_note_short_read);
       goto ok;
     }
-    wuffs_base__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
+    wuffs_private_impl__u32__sat_add_indirect(&self->private_impl.f_dst_x, ((uint32_t)(v_n)));
   }
   status = wuffs_base__make_status(NULL);
   goto ok;
@@ -30093,7 +32443,7 @@
 
   wuffs_base__status v_status = wuffs_base__make_status(NULL);
 
-  uint32_t coro_susp_point = self->private_impl.p_tell_me_more[0];
+  uint32_t coro_susp_point = self->private_impl.p_tell_me_more;
   switch (coro_susp_point) {
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
 
@@ -30111,13 +32461,13 @@
     }
 
     ok:
-    self->private_impl.p_tell_me_more[0] = 0;
+    self->private_impl.p_tell_me_more = 0;
     goto exit;
   }
 
   goto suspend;
   suspend:
-  self->private_impl.p_tell_me_more[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
+  self->private_impl.p_tell_me_more = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
   self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 4 : 0;
 
   goto exit;
@@ -30160,23 +32510,6 @@
   return status;
 }
 
-// -------- func bmp.decoder.history_retain_length
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_bmp__decoder__history_retain_length(
-    const wuffs_bmp__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
 // -------- func bmp.decoder.workbuf_len
 
 WUFFS_BASE__GENERATED_C_CODE
@@ -30217,9 +32550,9 @@
     io2_a_src = io0_a_src + a_src->meta.wi;
   }
 
-  uint32_t coro_susp_point = self->private_impl.p_read_palette[0];
+  uint32_t coro_susp_point = self->private_impl.p_read_palette;
   if (coro_susp_point) {
-    v_i = self->private_data.s_read_palette[0].v_i;
+    v_i = self->private_data.s_read_palette.v_i;
   }
   switch (coro_susp_point) {
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -30234,14 +32567,14 @@
             t_0 = ((uint32_t)(wuffs_base__peek_u24le__no_bounds_check(iop_a_src)));
             iop_a_src += 3;
           } else {
-            self->private_data.s_read_palette[0].scratch = 0;
+            self->private_data.s_read_palette.scratch = 0;
             WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
             while (true) {
               if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
                 status = wuffs_base__make_status(wuffs_base__suspension__short_read);
                 goto suspend;
               }
-              uint64_t* scratch = &self->private_data.s_read_palette[0].scratch;
+              uint64_t* scratch = &self->private_data.s_read_palette.scratch;
               uint32_t num_bits_0 = ((uint32_t)(*scratch >> 56));
               *scratch <<= 8;
               *scratch >>= 8;
@@ -30273,14 +32606,14 @@
             t_1 = wuffs_base__peek_u32le__no_bounds_check(iop_a_src);
             iop_a_src += 4;
           } else {
-            self->private_data.s_read_palette[0].scratch = 0;
+            self->private_data.s_read_palette.scratch = 0;
             WUFFS_BASE__COROUTINE_SUSPENSION_POINT(4);
             while (true) {
               if (WUFFS_BASE__UNLIKELY(iop_a_src == io2_a_src)) {
                 status = wuffs_base__make_status(wuffs_base__suspension__short_read);
                 goto suspend;
               }
-              uint64_t* scratch = &self->private_data.s_read_palette[0].scratch;
+              uint64_t* scratch = &self->private_data.s_read_palette.scratch;
               uint32_t num_bits_1 = ((uint32_t)(*scratch >> 56));
               *scratch <<= 8;
               *scratch >>= 8;
@@ -30313,14 +32646,14 @@
 
     goto ok;
     ok:
-    self->private_impl.p_read_palette[0] = 0;
+    self->private_impl.p_read_palette = 0;
     goto exit;
   }
 
   goto suspend;
   suspend:
-  self->private_impl.p_read_palette[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_read_palette[0].v_i = v_i;
+  self->private_impl.p_read_palette = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
+  self->private_data.s_read_palette.v_i = v_i;
 
   goto exit;
   exit:
@@ -30397,43 +32730,43 @@
 
 static const uint8_t
 WUFFS_BZIP2__CLAMP_TO_5[8] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 1, 2, 3, 4, 5, 5, 5,
+  0u, 1u, 2u, 3u, 4u, 5u, 5u, 5u,
 };
 
 static const uint32_t
 WUFFS_BZIP2__REV_CRC32_TABLE[256] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  0, 79764919, 159529838, 222504665, 319059676, 398814059, 445009330, 507990021,
-  638119352, 583659535, 797628118, 726387553, 890018660, 835552979, 1015980042, 944750013,
-  1276238704, 1221641927, 1167319070, 1095957929, 1595256236, 1540665371, 1452775106, 1381403509,
-  1780037320, 1859660671, 1671105958, 1733955601, 2031960084, 2111593891, 1889500026, 1952343757,
-  2552477408, 2632100695, 2443283854, 2506133561, 2334638140, 2414271883, 2191915858, 2254759653,
-  3190512472, 3135915759, 3081330742, 3009969537, 2905550212, 2850959411, 2762807018, 2691435357,
-  3560074640, 3505614887, 3719321342, 3648080713, 3342211916, 3287746299, 3467911202, 3396681109,
-  4063920168, 4143685023, 4223187782, 4286162673, 3779000052, 3858754371, 3904687514, 3967668269,
-  881225847, 809987520, 1023691545, 969234094, 662832811, 591600412, 771767749, 717299826,
-  311336399, 374308984, 453813921, 533576470, 25881363, 88864420, 134795389, 214552010,
-  2023205639, 2086057648, 1897238633, 1976864222, 1804852699, 1867694188, 1645340341, 1724971778,
-  1587496639, 1516133128, 1461550545, 1406951526, 1302016099, 1230646740, 1142491917, 1087903418,
-  2896545431, 2825181984, 2770861561, 2716262478, 3215044683, 3143675388, 3055782693, 3001194130,
-  2326604591, 2389456536, 2200899649, 2280525302, 2578013683, 2640855108, 2418763421, 2498394922,
-  3769900519, 3832873040, 3912640137, 3992402750, 4088425275, 4151408268, 4197601365, 4277358050,
-  3334271071, 3263032808, 3476998961, 3422541446, 3585640067, 3514407732, 3694837229, 3640369242,
-  1762451694, 1842216281, 1619975040, 1682949687, 2047383090, 2127137669, 1938468188, 2001449195,
-  1325665622, 1271206113, 1183200824, 1111960463, 1543535498, 1489069629, 1434599652, 1363369299,
-  622672798, 568075817, 748617968, 677256519, 907627842, 853037301, 1067152940, 995781531,
-  51762726, 131386257, 177728840, 240578815, 269590778, 349224269, 429104020, 491947555,
-  4046411278, 4126034873, 4172115296, 4234965207, 3794477266, 3874110821, 3953728444, 4016571915,
-  3609705398, 3555108353, 3735388376, 3664026991, 3290680682, 3236090077, 3449943556, 3378572211,
-  3174993278, 3120533705, 3032266256, 2961025959, 2923101090, 2868635157, 2813903052, 2742672763,
-  2604032198, 2683796849, 2461293480, 2524268063, 2284983834, 2364738477, 2175806836, 2238787779,
-  1569362073, 1498123566, 1409854455, 1355396672, 1317987909, 1246755826, 1192025387, 1137557660,
-  2072149281, 2135122070, 1912620623, 1992383480, 1753615357, 1816598090, 1627664531, 1707420964,
-  295390185, 358241886, 404320391, 483945776, 43990325, 106832002, 186451547, 266083308,
-  932423249, 861060070, 1041341759, 986742920, 613929101, 542559546, 756411363, 701822548,
-  3316196985, 3244833742, 3425377559, 3370778784, 3601682597, 3530312978, 3744426955, 3689838204,
-  3819031489, 3881883254, 3928223919, 4007849240, 4037393693, 4100235434, 4180117107, 4259748804,
-  2310601993, 2373574846, 2151335527, 2231098320, 2596047829, 2659030626, 2470359227, 2550115596,
-  2947551409, 2876312838, 2788305887, 2733848168, 3165939309, 3094707162, 3040238851, 2985771188,
+  0u, 79764919u, 159529838u, 222504665u, 319059676u, 398814059u, 445009330u, 507990021u,
+  638119352u, 583659535u, 797628118u, 726387553u, 890018660u, 835552979u, 1015980042u, 944750013u,
+  1276238704u, 1221641927u, 1167319070u, 1095957929u, 1595256236u, 1540665371u, 1452775106u, 1381403509u,
+  1780037320u, 1859660671u, 1671105958u, 1733955601u, 2031960084u, 2111593891u, 1889500026u, 1952343757u,
+  2552477408u, 2632100695u, 2443283854u, 2506133561u, 2334638140u, 2414271883u, 2191915858u, 2254759653u,
+  3190512472u, 3135915759u, 3081330742u, 3009969537u, 2905550212u, 2850959411u, 2762807018u, 2691435357u,
+  3560074640u, 3505614887u, 3719321342u, 3648080713u, 3342211916u, 3287746299u, 3467911202u, 3396681109u,
+  4063920168u, 4143685023u, 4223187782u, 4286162673u, 3779000052u, 3858754371u, 3904687514u, 3967668269u,
+  881225847u, 809987520u, 1023691545u, 969234094u, 662832811u, 591600412u, 771767749u, 717299826u,
+  311336399u, 374308984u, 453813921u, 533576470u, 25881363u, 88864420u, 134795389u, 214552010u,
+  2023205639u, 2086057648u, 1897238633u, 1976864222u, 1804852699u, 1867694188u, 1645340341u, 1724971778u,
+  1587496639u, 1516133128u, 1461550545u, 1406951526u, 1302016099u, 1230646740u, 1142491917u, 1087903418u,
+  2896545431u, 2825181984u, 2770861561u, 2716262478u, 3215044683u, 3143675388u, 3055782693u, 3001194130u,
+  2326604591u, 2389456536u, 2200899649u, 2280525302u, 2578013683u, 2640855108u, 2418763421u, 2498394922u,
+  3769900519u, 3832873040u, 3912640137u, 3992402750u, 4088425275u, 4151408268u, 4197601365u, 4277358050u,
+  3334271071u, 3263032808u, 3476998961u, 3422541446u, 3585640067u, 3514407732u, 3694837229u, 3640369242u,
+  1762451694u, 1842216281u, 1619975040u, 1682949687u, 2047383090u, 2127137669u, 1938468188u, 2001449195u,
+  1325665622u, 1271206113u, 1183200824u, 1111960463u, 1543535498u, 1489069629u, 1434599652u, 1363369299u,
+  622672798u, 568075817u, 748617968u, 677256519u, 907627842u, 853037301u, 1067152940u, 995781531u,
+  51762726u, 131386257u, 177728840u, 240578815u, 269590778u, 349224269u, 429104020u, 491947555u,
+  4046411278u, 4126034873u, 4172115296u, 4234965207u, 3794477266u, 3874110821u, 3953728444u, 4016571915u,
+  3609705398u, 3555108353u, 3735388376u, 3664026991u, 3290680682u, 3236090077u, 3449943556u, 3378572211u,
+  3174993278u, 3120533705u, 3032266256u, 2961025959u, 2923101090u, 2868635157u, 2813903052u, 2742672763u,
+  2604032198u, 2683796849u, 2461293480u, 2524268063u, 2284983834u, 2364738477u, 2175806836u, 2238787779u,
+  1569362073u, 1498123566u, 1409854455u, 1355396672u, 1317987909u, 1246755826u, 1192025387u, 1137557660u,
+  2072149281u, 2135122070u, 1912620623u, 1992383480u, 1753615357u, 1816598090u, 1627664531u, 1707420964u,
+  295390185u, 358241886u, 404320391u, 483945776u, 43990325u, 106832002u, 186451547u, 266083308u,
+  932423249u, 861060070u, 1041341759u, 986742920u, 613929101u, 542559546u, 756411363u, 701822548u,
+  3316196985u, 3244833742u, 3425377559u, 3370778784u, 3601682597u, 3530312978u, 3744426955u, 3689838204u,
+  3819031489u, 3881883254u, 3928223919u, 4007849240u, 4037393693u, 4100235434u, 4180117107u, 4259748804u,
+  2310601993u, 2373574846u, 2151335527u, 2231098320u, 2596047829u, 2659030626u, 2470359227u, 2550115596u,
+  2947551409u, 2876312838u, 2788305887u, 2733848168u, 3165939309u, 3094707162u, 3040238851u, 2985771188u,
 };
 
 // ---------------- Private Initializer Prototypes
@@ -30505,9 +32838,9 @@
 
 const wuffs_base__io_transformer__func_ptrs
 wuffs_bzip2__decoder__func_ptrs_for__wuffs_base__io_transformer = {
+  (wuffs_base__optional_u63(*)(const void*))(&wuffs_bzip2__decoder__dst_history_retain_length),
   (uint64_t(*)(const void*,
       uint32_t))(&wuffs_bzip2__decoder__get_quirk),
-  (uint64_t(*)(const void*))(&wuffs_bzip2__decoder__history_retain_length),
   (wuffs_base__status(*)(void*,
       uint32_t,
       uint64_t))(&wuffs_bzip2__decoder__set_quirk),
@@ -30604,6 +32937,9 @@
     return 0;
   }
 
+  if ((a_key == 1u) && self->private_impl.f_ignore_checksum) {
+    return 1u;
+  }
   return 0u;
 }
 
@@ -30632,21 +32968,21 @@
   return wuffs_base__make_status(wuffs_base__error__unsupported_option);
 }
 
-// -------- func bzip2.decoder.history_retain_length
+// -------- func bzip2.decoder.dst_history_retain_length
 
 WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_bzip2__decoder__history_retain_length(
+WUFFS_BASE__MAYBE_STATIC wuffs_base__optional_u63
+wuffs_bzip2__decoder__dst_history_retain_length(
     const wuffs_bzip2__decoder* self) {
   if (!self) {
-    return 0;
+    return wuffs_base__utility__make_optional_u63(false, 0u);
   }
   if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
       (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
+    return wuffs_base__utility__make_optional_u63(false, 0u);
   }
 
-  return 0u;
+  return wuffs_base__utility__make_optional_u63(true, 0u);
 }
 
 // -------- func bzip2.decoder.workbuf_len
@@ -30698,7 +33034,7 @@
 
   wuffs_base__status v_status = wuffs_base__make_status(NULL);
 
-  uint32_t coro_susp_point = self->private_impl.p_transform_io[0];
+  uint32_t coro_susp_point = self->private_impl.p_transform_io;
   switch (coro_susp_point) {
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
 
@@ -30716,13 +33052,13 @@
     }
 
     ok:
-    self->private_impl.p_transform_io[0] = 0;
+    self->private_impl.p_transform_io = 0;
     goto exit;
   }
 
   goto suspend;
   suspend:
-  self->private_impl.p_transform_io[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
+  self->private_impl.p_transform_io = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
   self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
 
   goto exit;
@@ -30744,7 +33080,7 @@
     wuffs_base__slice_u8 a_workbuf) {
   wuffs_base__status status = wuffs_base__make_status(NULL);
 
-  uint8_t v_c = 0;
+  uint8_t v_c8 = 0;
   uint32_t v_i = 0;
   uint64_t v_tag = 0;
   wuffs_base__status v_status = wuffs_base__make_status(NULL);
@@ -30761,11 +33097,11 @@
     io2_a_src = io0_a_src + a_src->meta.wi;
   }
 
-  uint32_t coro_susp_point = self->private_impl.p_do_transform_io[0];
+  uint32_t coro_susp_point = self->private_impl.p_do_transform_io;
   if (coro_susp_point) {
-    v_i = self->private_data.s_do_transform_io[0].v_i;
-    v_tag = self->private_data.s_do_transform_io[0].v_tag;
-    v_final_checksum_want = self->private_data.s_do_transform_io[0].v_final_checksum_want;
+    v_i = self->private_data.s_do_transform_io.v_i;
+    v_tag = self->private_data.s_do_transform_io.v_tag;
+    v_final_checksum_want = self->private_data.s_do_transform_io.v_final_checksum_want;
   }
   switch (coro_susp_point) {
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -30777,9 +33113,9 @@
         goto suspend;
       }
       uint8_t t_0 = *iop_a_src++;
-      v_c = t_0;
+      v_c8 = t_0;
     }
-    if (v_c != 66u) {
+    if (v_c8 != 66u) {
       status = wuffs_base__make_status(wuffs_bzip2__error__bad_header);
       goto exit;
     }
@@ -30790,9 +33126,9 @@
         goto suspend;
       }
       uint8_t t_1 = *iop_a_src++;
-      v_c = t_1;
+      v_c8 = t_1;
     }
-    if (v_c != 90u) {
+    if (v_c8 != 90u) {
       status = wuffs_base__make_status(wuffs_bzip2__error__bad_header);
       goto exit;
     }
@@ -30803,9 +33139,9 @@
         goto suspend;
       }
       uint8_t t_2 = *iop_a_src++;
-      v_c = t_2;
+      v_c8 = t_2;
     }
-    if (v_c != 104u) {
+    if (v_c8 != 104u) {
       status = wuffs_base__make_status(wuffs_bzip2__error__bad_header);
       goto exit;
     }
@@ -30816,13 +33152,13 @@
         goto suspend;
       }
       uint8_t t_3 = *iop_a_src++;
-      v_c = t_3;
+      v_c8 = t_3;
     }
-    if ((v_c < 49u) || (57u < v_c)) {
+    if ((v_c8 < 49u) || (57u < v_c8)) {
       status = wuffs_base__make_status(wuffs_bzip2__error__bad_header);
       goto exit;
     }
-    self->private_impl.f_max_incl_block_size = (((uint32_t)((v_c - 48u))) * 100000u);
+    self->private_impl.f_max_incl_block_size = (((uint32_t)(((uint8_t)(v_c8 - 48u)))) * 100000u);
     while (true) {
       v_tag = 0u;
       v_i = 0u;
@@ -30835,9 +33171,9 @@
               goto suspend;
             }
             uint8_t t_4 = *iop_a_src++;
-            v_c = t_4;
+            v_c8 = t_4;
           }
-          self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
+          self->private_impl.f_bits = (((uint32_t)(v_c8)) << 24u);
           self->private_impl.f_n_bits = 8u;
         }
         v_tag <<= 1u;
@@ -30865,7 +33201,7 @@
       }
       self->private_impl.f_block_size = 0u;
       self->private_impl.f_decode_huffman_finished = false;
-      self->private_impl.f_decode_huffman_which = WUFFS_BZIP2__CLAMP_TO_5[(self->private_data.f_huffman_selectors[0u] & 7u)];
+      self->private_impl.f_decode_huffman_which = WUFFS_BZIP2__CLAMP_TO_5[((uint8_t)(self->private_data.f_huffman_selectors[0u] & 7u))];
       self->private_impl.f_decode_huffman_ticks = 50u;
       self->private_impl.f_decode_huffman_section = 0u;
       self->private_impl.f_decode_huffman_run_shift = 0u;
@@ -30933,9 +33269,9 @@
             goto suspend;
           }
           uint8_t t_5 = *iop_a_src++;
-          v_c = t_5;
+          v_c8 = t_5;
         }
-        self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
+        self->private_impl.f_bits = (((uint32_t)(v_c8)) << 24u);
         self->private_impl.f_n_bits = 8u;
       }
       v_final_checksum_want <<= 1u;
@@ -30951,16 +33287,16 @@
 
     goto ok;
     ok:
-    self->private_impl.p_do_transform_io[0] = 0;
+    self->private_impl.p_do_transform_io = 0;
     goto exit;
   }
 
   goto suspend;
   suspend:
-  self->private_impl.p_do_transform_io[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_do_transform_io[0].v_i = v_i;
-  self->private_data.s_do_transform_io[0].v_tag = v_tag;
-  self->private_data.s_do_transform_io[0].v_final_checksum_want = v_final_checksum_want;
+  self->private_impl.p_do_transform_io = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
+  self->private_data.s_do_transform_io.v_i = v_i;
+  self->private_data.s_do_transform_io.v_tag = v_tag;
+  self->private_data.s_do_transform_io.v_final_checksum_want = v_final_checksum_want;
 
   goto exit;
   exit:
@@ -30980,7 +33316,7 @@
     wuffs_base__io_buffer* a_src) {
   wuffs_base__status status = wuffs_base__make_status(NULL);
 
-  uint8_t v_c = 0;
+  uint8_t v_c8 = 0;
   uint32_t v_i = 0;
   uint32_t v_j = 0;
   uint32_t v_selector = 0;
@@ -30999,10 +33335,10 @@
     io2_a_src = io0_a_src + a_src->meta.wi;
   }
 
-  uint32_t coro_susp_point = self->private_impl.p_prepare_block[0];
+  uint32_t coro_susp_point = self->private_impl.p_prepare_block;
   if (coro_susp_point) {
-    v_i = self->private_data.s_prepare_block[0].v_i;
-    v_selector = self->private_data.s_prepare_block[0].v_selector;
+    v_i = self->private_data.s_prepare_block.v_i;
+    v_selector = self->private_data.s_prepare_block.v_selector;
   }
   switch (coro_susp_point) {
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -31018,9 +33354,9 @@
             goto suspend;
           }
           uint8_t t_0 = *iop_a_src++;
-          v_c = t_0;
+          v_c8 = t_0;
         }
-        self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
+        self->private_impl.f_bits = (((uint32_t)(v_c8)) << 24u);
         self->private_impl.f_n_bits = 8u;
       }
       self->private_impl.f_block_checksum_want <<= 1u;
@@ -31037,9 +33373,9 @@
           goto suspend;
         }
         uint8_t t_1 = *iop_a_src++;
-        v_c = t_1;
+        v_c8 = t_1;
       }
-      self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
+      self->private_impl.f_bits = (((uint32_t)(v_c8)) << 24u);
       self->private_impl.f_n_bits = 8u;
     }
     if ((self->private_impl.f_bits >> 31u) != 0u) {
@@ -31059,9 +33395,9 @@
             goto suspend;
           }
           uint8_t t_2 = *iop_a_src++;
-          v_c = t_2;
+          v_c8 = t_2;
         }
-        self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
+        self->private_impl.f_bits = (((uint32_t)(v_c8)) << 24u);
         self->private_impl.f_n_bits = 8u;
       }
       self->private_impl.f_original_pointer <<= 1u;
@@ -31085,9 +33421,9 @@
             goto suspend;
           }
           uint8_t t_3 = *iop_a_src++;
-          v_c = t_3;
+          v_c8 = t_3;
         }
-        self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
+        self->private_impl.f_bits = (((uint32_t)(v_c8)) << 24u);
         self->private_impl.f_n_bits = 8u;
       }
       if ((self->private_impl.f_bits >> 31u) != 0u) {
@@ -31113,9 +33449,9 @@
               goto suspend;
             }
             uint8_t t_4 = *iop_a_src++;
-            v_c = t_4;
+            v_c8 = t_4;
           }
-          self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
+          self->private_impl.f_bits = (((uint32_t)(v_c8)) << 24u);
           self->private_impl.f_n_bits = 8u;
         }
         self->private_data.f_scratch += (self->private_impl.f_bits >> 31u);
@@ -31144,9 +33480,9 @@
             goto suspend;
           }
           uint8_t t_5 = *iop_a_src++;
-          v_c = t_5;
+          v_c8 = t_5;
         }
-        self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
+        self->private_impl.f_bits = (((uint32_t)(v_c8)) << 24u);
         self->private_impl.f_n_bits = 8u;
       }
       self->private_data.f_scratch <<= 1u;
@@ -31171,9 +33507,9 @@
             goto suspend;
           }
           uint8_t t_6 = *iop_a_src++;
-          v_c = t_6;
+          v_c8 = t_6;
         }
-        self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
+        self->private_impl.f_bits = (((uint32_t)(v_c8)) << 24u);
         self->private_impl.f_n_bits = 8u;
       }
       self->private_data.f_scratch <<= 1u;
@@ -31204,9 +33540,9 @@
               goto suspend;
             }
             uint8_t t_7 = *iop_a_src++;
-            v_c = t_7;
+            v_c8 = t_7;
           }
-          self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
+          self->private_impl.f_bits = (((uint32_t)(v_c8)) << 24u);
           self->private_impl.f_n_bits = 8u;
         }
         if ((self->private_impl.f_bits >> 31u) == 0u) {
@@ -31227,7 +33563,7 @@
       } else {
         v_sel_ff = (v_selector & 255u);
         v_movee = self->private_data.f_mtft[v_sel_ff];
-        wuffs_base__slice_u8__copy_from_slice(wuffs_base__make_slice_u8_ij(self->private_data.f_mtft, 1, (1u + v_sel_ff)), wuffs_base__make_slice_u8(self->private_data.f_mtft, v_sel_ff));
+        wuffs_private_impl__slice_u8__copy_from_slice(wuffs_base__make_slice_u8_ij(self->private_data.f_mtft, 1, (1u + v_sel_ff)), wuffs_base__make_slice_u8(self->private_data.f_mtft, v_sel_ff));
         self->private_data.f_mtft[0u] = v_movee;
         self->private_data.f_huffman_selectors[v_i] = v_movee;
       }
@@ -31271,15 +33607,15 @@
 
     goto ok;
     ok:
-    self->private_impl.p_prepare_block[0] = 0;
+    self->private_impl.p_prepare_block = 0;
     goto exit;
   }
 
   goto suspend;
   suspend:
-  self->private_impl.p_prepare_block[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_prepare_block[0].v_i = v_i;
-  self->private_data.s_prepare_block[0].v_selector = v_selector;
+  self->private_impl.p_prepare_block = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
+  self->private_data.s_prepare_block.v_i = v_i;
+  self->private_data.s_prepare_block.v_selector = v_selector;
 
   goto exit;
   exit:
@@ -31299,7 +33635,7 @@
     wuffs_base__io_buffer* a_src) {
   wuffs_base__status status = wuffs_base__make_status(NULL);
 
-  uint8_t v_c = 0;
+  uint8_t v_c8 = 0;
   uint32_t v_i = 0;
   uint32_t v_code_length = 0;
 
@@ -31314,10 +33650,10 @@
     io2_a_src = io0_a_src + a_src->meta.wi;
   }
 
-  uint32_t coro_susp_point = self->private_impl.p_read_code_lengths[0];
+  uint32_t coro_susp_point = self->private_impl.p_read_code_lengths;
   if (coro_susp_point) {
-    v_i = self->private_data.s_read_code_lengths[0].v_i;
-    v_code_length = self->private_data.s_read_code_lengths[0].v_code_length;
+    v_i = self->private_data.s_read_code_lengths.v_i;
+    v_code_length = self->private_data.s_read_code_lengths.v_code_length;
   }
   switch (coro_susp_point) {
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -31333,9 +33669,9 @@
             goto suspend;
           }
           uint8_t t_0 = *iop_a_src++;
-          v_c = t_0;
+          v_c8 = t_0;
         }
-        self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
+        self->private_impl.f_bits = (((uint32_t)(v_c8)) << 24u);
         self->private_impl.f_n_bits = 8u;
       }
       v_code_length <<= 1u;
@@ -31359,9 +33695,9 @@
               goto suspend;
             }
             uint8_t t_1 = *iop_a_src++;
-            v_c = t_1;
+            v_c8 = t_1;
           }
-          self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
+          self->private_impl.f_bits = (((uint32_t)(v_c8)) << 24u);
           self->private_impl.f_n_bits = 8u;
         }
         if ((self->private_impl.f_bits >> 31u) == 0u) {
@@ -31379,9 +33715,9 @@
               goto suspend;
             }
             uint8_t t_2 = *iop_a_src++;
-            v_c = t_2;
+            v_c8 = t_2;
           }
-          self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
+          self->private_impl.f_bits = (((uint32_t)(v_c8)) << 24u);
           self->private_impl.f_n_bits = 8u;
         }
         if ((self->private_impl.f_bits >> 31u) == 0u) {
@@ -31399,15 +33735,15 @@
 
     goto ok;
     ok:
-    self->private_impl.p_read_code_lengths[0] = 0;
+    self->private_impl.p_read_code_lengths = 0;
     goto exit;
   }
 
   goto suspend;
   suspend:
-  self->private_impl.p_read_code_lengths[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_read_code_lengths[0].v_i = v_i;
-  self->private_data.s_read_code_lengths[0].v_code_length = v_code_length;
+  self->private_impl.p_read_code_lengths = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
+  self->private_data.s_read_code_lengths.v_i = v_i;
+  self->private_data.s_read_code_lengths.v_code_length = v_code_length;
 
   goto exit;
   exit:
@@ -31530,7 +33866,7 @@
 #pragma GCC diagnostic pop
 #endif
     }
-    self->private_data.f_huffman_tables[a_which][v_i] = ((uint16_t)((v_child | (v_n_bits << 12u))));
+    self->private_data.f_huffman_tables[a_which][v_i] = ((uint16_t)(((uint16_t)(v_child | ((uint16_t)(v_n_bits << 12u))))));
     v_i += 1u;
   }
   return wuffs_base__make_empty_struct();
@@ -31609,7 +33945,7 @@
       } else {
         v_flush_repeat_count = 1u;
       }
-      v_block_checksum_have = (WUFFS_BZIP2__REV_CRC32_TABLE[(((uint8_t)((v_block_checksum_have >> 24u))) ^ v_curr)] ^ ((uint32_t)(v_block_checksum_have << 8u)));
+      v_block_checksum_have = (WUFFS_BZIP2__REV_CRC32_TABLE[((uint8_t)(((uint8_t)((v_block_checksum_have >> 24u))) ^ v_curr))] ^ ((uint32_t)(v_block_checksum_have << 8u)));
       (wuffs_base__poke_u8be__no_bounds_check(iop_a_dst, v_curr), iop_a_dst += 1);
       v_flush_prev = v_curr;
       v_block_size -= 1u;
@@ -31619,7 +33955,7 @@
       v_flush_pointer = (v_entry >> 12u);
       v_flush_repeat_count = ((uint32_t)(v_curr));
       while (v_flush_repeat_count > 0u) {
-        v_block_checksum_have = (WUFFS_BZIP2__REV_CRC32_TABLE[(((uint8_t)((v_block_checksum_have >> 24u))) ^ v_flush_prev)] ^ ((uint32_t)(v_block_checksum_have << 8u)));
+        v_block_checksum_have = (WUFFS_BZIP2__REV_CRC32_TABLE[((uint8_t)(((uint8_t)((v_block_checksum_have >> 24u))) ^ v_flush_prev))] ^ ((uint32_t)(v_block_checksum_have << 8u)));
         if (((uint64_t)(io2_a_dst - iop_a_dst)) > 0u) {
           (wuffs_base__poke_u8be__no_bounds_check(iop_a_dst, v_flush_prev), iop_a_dst += 1);
         }
@@ -31675,14 +34011,14 @@
     }
   }
 
-  uint32_t coro_susp_point = self->private_impl.p_flush_slow[0];
+  uint32_t coro_susp_point = self->private_impl.p_flush_slow;
   if (coro_susp_point) {
-    v_flush_pointer = self->private_data.s_flush_slow[0].v_flush_pointer;
-    v_flush_repeat_count = self->private_data.s_flush_slow[0].v_flush_repeat_count;
-    v_flush_prev = self->private_data.s_flush_slow[0].v_flush_prev;
-    v_block_checksum_have = self->private_data.s_flush_slow[0].v_block_checksum_have;
-    v_block_size = self->private_data.s_flush_slow[0].v_block_size;
-    v_curr = self->private_data.s_flush_slow[0].v_curr;
+    v_flush_pointer = self->private_data.s_flush_slow.v_flush_pointer;
+    v_flush_repeat_count = self->private_data.s_flush_slow.v_flush_repeat_count;
+    v_flush_prev = self->private_data.s_flush_slow.v_flush_prev;
+    v_block_checksum_have = self->private_data.s_flush_slow.v_block_checksum_have;
+    v_block_size = self->private_data.s_flush_slow.v_block_size;
+    v_curr = self->private_data.s_flush_slow.v_curr;
   }
   switch (coro_susp_point) {
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -31692,7 +34028,7 @@
     v_flush_prev = self->private_impl.f_flush_prev;
     v_block_checksum_have = self->private_impl.f_block_checksum_have;
     v_block_size = self->private_impl.f_block_size;
-    while ((v_block_size > 0u) &&  ! (self->private_impl.p_flush_slow[0] != 0)) {
+    while ((v_block_size > 0u) &&  ! (self->private_impl.p_flush_slow != 0)) {
       if (v_flush_repeat_count < 4u) {
         v_entry = self->private_data.f_bwt[v_flush_pointer];
         v_curr = ((uint8_t)(v_entry));
@@ -31702,14 +34038,14 @@
         } else {
           v_flush_repeat_count = 1u;
         }
-        v_block_checksum_have = (WUFFS_BZIP2__REV_CRC32_TABLE[(((uint8_t)((v_block_checksum_have >> 24u))) ^ v_curr)] ^ ((uint32_t)(v_block_checksum_have << 8u)));
-        self->private_data.s_flush_slow[0].scratch = v_curr;
+        v_block_checksum_have = (WUFFS_BZIP2__REV_CRC32_TABLE[((uint8_t)(((uint8_t)((v_block_checksum_have >> 24u))) ^ v_curr))] ^ ((uint32_t)(v_block_checksum_have << 8u)));
+        self->private_data.s_flush_slow.scratch = v_curr;
         WUFFS_BASE__COROUTINE_SUSPENSION_POINT(1);
         if (iop_a_dst == io2_a_dst) {
           status = wuffs_base__make_status(wuffs_base__suspension__short_write);
           goto suspend;
         }
-        *iop_a_dst++ = ((uint8_t)(self->private_data.s_flush_slow[0].scratch));
+        *iop_a_dst++ = ((uint8_t)(self->private_data.s_flush_slow.scratch));
         v_flush_prev = v_curr;
         v_block_size -= 1u;
       } else {
@@ -31718,14 +34054,14 @@
         v_flush_pointer = (v_entry >> 12u);
         v_flush_repeat_count = ((uint32_t)(v_curr));
         while (v_flush_repeat_count > 0u) {
-          v_block_checksum_have = (WUFFS_BZIP2__REV_CRC32_TABLE[(((uint8_t)((v_block_checksum_have >> 24u))) ^ v_flush_prev)] ^ ((uint32_t)(v_block_checksum_have << 8u)));
-          self->private_data.s_flush_slow[0].scratch = v_flush_prev;
+          v_block_checksum_have = (WUFFS_BZIP2__REV_CRC32_TABLE[((uint8_t)(((uint8_t)((v_block_checksum_have >> 24u))) ^ v_flush_prev))] ^ ((uint32_t)(v_block_checksum_have << 8u)));
+          self->private_data.s_flush_slow.scratch = v_flush_prev;
           WUFFS_BASE__COROUTINE_SUSPENSION_POINT(2);
           if (iop_a_dst == io2_a_dst) {
             status = wuffs_base__make_status(wuffs_base__suspension__short_write);
             goto suspend;
           }
-          *iop_a_dst++ = ((uint8_t)(self->private_data.s_flush_slow[0].scratch));
+          *iop_a_dst++ = ((uint8_t)(self->private_data.s_flush_slow.scratch));
           v_flush_repeat_count -= 1u;
         }
         v_flush_repeat_count = 0u;
@@ -31743,19 +34079,19 @@
 
     goto ok;
     ok:
-    self->private_impl.p_flush_slow[0] = 0;
+    self->private_impl.p_flush_slow = 0;
     goto exit;
   }
 
   goto suspend;
   suspend:
-  self->private_impl.p_flush_slow[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_flush_slow[0].v_flush_pointer = v_flush_pointer;
-  self->private_data.s_flush_slow[0].v_flush_repeat_count = v_flush_repeat_count;
-  self->private_data.s_flush_slow[0].v_flush_prev = v_flush_prev;
-  self->private_data.s_flush_slow[0].v_block_checksum_have = v_block_checksum_have;
-  self->private_data.s_flush_slow[0].v_block_size = v_block_size;
-  self->private_data.s_flush_slow[0].v_curr = v_curr;
+  self->private_impl.p_flush_slow = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
+  self->private_data.s_flush_slow.v_flush_pointer = v_flush_pointer;
+  self->private_data.s_flush_slow.v_flush_repeat_count = v_flush_repeat_count;
+  self->private_data.s_flush_slow.v_flush_prev = v_flush_prev;
+  self->private_data.s_flush_slow.v_block_checksum_have = v_block_checksum_have;
+  self->private_data.s_flush_slow.v_block_size = v_block_size;
+  self->private_data.s_flush_slow.v_curr = v_curr;
 
   goto exit;
   exit:
@@ -31819,15 +34155,15 @@
         status = wuffs_base__make_status(wuffs_bzip2__error__bad_number_of_sections);
         goto exit;
       }
-      v_which = WUFFS_BZIP2__CLAMP_TO_5[(self->private_data.f_huffman_selectors[(v_section & 32767u)] & 7u)];
+      v_which = WUFFS_BZIP2__CLAMP_TO_5[((uint8_t)(self->private_data.f_huffman_selectors[(v_section & 32767u)] & 7u))];
     }
     v_bits |= (wuffs_base__peek_u32be__no_bounds_check(iop_a_src) >> v_n_bits);
     iop_a_src += ((31u - v_n_bits) >> 3u);
     v_n_bits |= 24u;
     v_table_entry = self->private_data.f_huffman_tables[v_which][(v_bits >> 24u)];
-    v_bits <<= (v_table_entry >> 12u);
-    v_n_bits -= ((uint32_t)((v_table_entry >> 12u)));
-    v_child = (v_table_entry & 1023u);
+    v_bits <<= ((uint16_t)(v_table_entry >> 12u));
+    v_n_bits -= ((uint32_t)(((uint16_t)(v_table_entry >> 12u))));
+    v_child = ((uint16_t)(v_table_entry & 1023u));
     while (v_child < 257u) {
       v_child = self->private_data.f_huffman_trees[v_which][v_child][(v_bits >> 31u)];
       v_bits <<= 1u;
@@ -31838,9 +34174,9 @@
       v_n_bits -= 1u;
     }
     if (v_child < 768u) {
-      v_child_ff = ((uint32_t)((v_child & 255u)));
+      v_child_ff = ((uint32_t)(((uint16_t)(v_child & 255u))));
       v_output = ((uint32_t)(self->private_data.f_mtft[v_child_ff]));
-      wuffs_base__slice_u8__copy_from_slice(wuffs_base__make_slice_u8_ij(self->private_data.f_mtft, 1, (1u + v_child_ff)), wuffs_base__make_slice_u8(self->private_data.f_mtft, v_child_ff));
+      wuffs_private_impl__slice_u8__copy_from_slice(wuffs_base__make_slice_u8_ij(self->private_data.f_mtft, 1, (1u + v_child_ff)), wuffs_base__make_slice_u8(self->private_data.f_mtft, v_child_ff));
       self->private_data.f_mtft[0u] = ((uint8_t)(v_output));
       self->private_data.f_letter_counts[v_output] += 1u;
       self->private_data.f_bwt[v_block_size] = v_output;
@@ -31904,7 +34240,7 @@
     wuffs_base__io_buffer* a_src) {
   wuffs_base__status status = wuffs_base__make_status(NULL);
 
-  uint8_t v_c = 0;
+  uint8_t v_c8 = 0;
   uint32_t v_node_index = 0;
   uint16_t v_child = 0;
   uint32_t v_child_ff = 0;
@@ -31925,14 +34261,14 @@
     io2_a_src = io0_a_src + a_src->meta.wi;
   }
 
-  uint32_t coro_susp_point = self->private_impl.p_decode_huffman_slow[0];
+  uint32_t coro_susp_point = self->private_impl.p_decode_huffman_slow;
   if (coro_susp_point) {
-    v_node_index = self->private_data.s_decode_huffman_slow[0].v_node_index;
+    v_node_index = self->private_data.s_decode_huffman_slow.v_node_index;
   }
   switch (coro_susp_point) {
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
 
-    while ( ! (self->private_impl.p_decode_huffman_slow[0] != 0)) {
+    while ( ! (self->private_impl.p_decode_huffman_slow != 0)) {
       if (self->private_impl.f_decode_huffman_ticks > 0u) {
         self->private_impl.f_decode_huffman_ticks -= 1u;
       } else {
@@ -31942,7 +34278,7 @@
           status = wuffs_base__make_status(wuffs_bzip2__error__bad_number_of_sections);
           goto exit;
         }
-        self->private_impl.f_decode_huffman_which = WUFFS_BZIP2__CLAMP_TO_5[(self->private_data.f_huffman_selectors[(self->private_impl.f_decode_huffman_section & 32767u)] & 7u)];
+        self->private_impl.f_decode_huffman_which = WUFFS_BZIP2__CLAMP_TO_5[((uint8_t)(self->private_data.f_huffman_selectors[(self->private_impl.f_decode_huffman_section & 32767u)] & 7u))];
       }
       v_node_index = 0u;
       while (true) {
@@ -31954,9 +34290,9 @@
               goto suspend;
             }
             uint8_t t_0 = *iop_a_src++;
-            v_c = t_0;
+            v_c8 = t_0;
           }
-          self->private_impl.f_bits = (((uint32_t)(v_c)) << 24u);
+          self->private_impl.f_bits = (((uint32_t)(v_c8)) << 24u);
           self->private_impl.f_n_bits = 8u;
         }
         v_child = self->private_data.f_huffman_trees[self->private_impl.f_decode_huffman_which][v_node_index][(self->private_impl.f_bits >> 31u)];
@@ -31966,9 +34302,9 @@
           v_node_index = ((uint32_t)(v_child));
           continue;
         } else if (v_child < 768u) {
-          v_child_ff = ((uint32_t)((v_child & 255u)));
+          v_child_ff = ((uint32_t)(((uint16_t)(v_child & 255u))));
           v_output = ((uint32_t)(self->private_data.f_mtft[v_child_ff]));
-          wuffs_base__slice_u8__copy_from_slice(wuffs_base__make_slice_u8_ij(self->private_data.f_mtft, 1, (1u + v_child_ff)), wuffs_base__make_slice_u8(self->private_data.f_mtft, v_child_ff));
+          wuffs_private_impl__slice_u8__copy_from_slice(wuffs_base__make_slice_u8_ij(self->private_data.f_mtft, 1, (1u + v_child_ff)), wuffs_base__make_slice_u8(self->private_data.f_mtft, v_child_ff));
           self->private_data.f_mtft[0u] = ((uint8_t)(v_output));
           self->private_data.f_letter_counts[v_output] += 1u;
           self->private_data.f_bwt[self->private_impl.f_block_size] = v_output;
@@ -32009,14 +34345,14 @@
 
     goto ok;
     ok:
-    self->private_impl.p_decode_huffman_slow[0] = 0;
+    self->private_impl.p_decode_huffman_slow = 0;
     goto exit;
   }
 
   goto suspend;
   suspend:
-  self->private_impl.p_decode_huffman_slow[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
-  self->private_data.s_decode_huffman_slow[0].v_node_index = v_node_index;
+  self->private_impl.p_decode_huffman_slow = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
+  self->private_data.s_decode_huffman_slow.v_node_index = v_node_index;
 
   goto exit;
   exit:
@@ -32042,15 +34378,15 @@
 
 static const uint32_t
 WUFFS_CBOR__LITERALS[4] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  8388612, 8388616, 8388610, 8388609,
+  8388612u, 8388616u, 8388610u, 8388609u,
 };
 
 static const uint8_t
 WUFFS_CBOR__TOKEN_LENGTHS[32] WUFFS_BASE__POTENTIALLY_UNUSED = {
-  1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1,
-  1, 1, 1, 1, 1, 1, 1, 1,
-  2, 3, 5, 9, 0, 0, 0, 1,
+  1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
+  1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
+  1u, 1u, 1u, 1u, 1u, 1u, 1u, 1u,
+  2u, 3u, 5u, 9u, 0u, 0u, 0u, 1u,
 };
 
 // ---------------- Private Initializer Prototypes
@@ -32067,7 +34403,6 @@
       wuffs_base__slice_u8))(&wuffs_cbor__decoder__decode_tokens),
   (uint64_t(*)(const void*,
       uint32_t))(&wuffs_cbor__decoder__get_quirk),
-  (uint64_t(*)(const void*))(&wuffs_cbor__decoder__history_retain_length),
   (wuffs_base__status(*)(void*,
       uint32_t,
       uint64_t))(&wuffs_cbor__decoder__set_quirk),
@@ -32184,23 +34519,6 @@
   return wuffs_base__make_status(wuffs_base__error__unsupported_option);
 }
 
-// -------- func cbor.decoder.history_retain_length
-
-WUFFS_BASE__GENERATED_C_CODE
-WUFFS_BASE__MAYBE_STATIC uint64_t
-wuffs_cbor__decoder__history_retain_length(
-    const wuffs_cbor__decoder* self) {
-  if (!self) {
-    return 0;
-  }
-  if ((self->private_impl.magic != WUFFS_BASE__MAGIC) &&
-      (self->private_impl.magic != WUFFS_BASE__DISABLED)) {
-    return 0;
-  }
-
-  return 0u;
-}
-
 // -------- func cbor.decoder.workbuf_len
 
 WUFFS_BASE__GENERATED_C_CODE
@@ -32258,7 +34576,7 @@
   uint32_t v_vminor = 0;
   uint32_t v_vminor_alt = 0;
   uint32_t v_continued = 0;
-  uint8_t v_c = 0;
+  uint8_t v_c8 = 0;
   uint8_t v_c_major = 0;
   uint8_t v_c_minor = 0;
   bool v_tagged = false;
@@ -32288,12 +34606,12 @@
     io2_a_src = io0_a_src + a_src->meta.wi;
   }
 
-  uint32_t coro_susp_point = self->private_impl.p_decode_tokens[0];
+  uint32_t coro_susp_point = self->private_impl.p_decode_tokens;
   if (coro_susp_point) {
-    v_string_length = self->private_data.s_decode_tokens[0].v_string_length;
-    v_depth = self->private_data.s_decode_tokens[0].v_depth;
-    v_tagged = self->private_data.s_decode_tokens[0].v_tagged;
-    v_indefinite_string_major_type = self->private_data.s_decode_tokens[0].v_indefinite_string_major_type;
+    v_string_length = self->private_data.s_decode_tokens.v_string_length;
+    v_depth = self->private_data.s_decode_tokens.v_depth;
+    v_tagged = self->private_data.s_decode_tokens.v_tagged;
+    v_indefinite_string_major_type = self->private_data.s_decode_tokens.v_indefinite_string_major_type;
   }
   switch (coro_susp_point) {
     WUFFS_BASE__COROUTINE_SUSPENSION_POINT_0;
@@ -32320,9 +34638,9 @@
             WUFFS_BASE__COROUTINE_SUSPENSION_POINT_MAYBE_SUSPEND(2);
             goto label__outer__continue;
           }
-          v_c = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
-          if ((v_indefinite_string_major_type != 0u) && (v_indefinite_string_major_type != (v_c >> 5u))) {
-            if (v_c != 255u) {
+          v_c8 = wuffs_base__peek_u8be__no_bounds_check(iop_a_src);
+          if ((v_indefinite_string_major_type != 0u) && (v_indefinite_string_major_type != ((uint8_t)(v_c8 >> 5u)))) {
+            if (v_c8 != 255u) {
               status = wuffs_base__make_status(wuffs_cbor__error__bad_input);
               goto exit;
             }
@@ -32338,8 +34656,8 @@
             goto label__goto_parsed_a_leaf_value__break;
           }
           iop_a_src += 1u;
-          v_c_major = ((uint8_t)((v_c >> 5u)));
-          v_c_minor = (v_c & 31u);
+          v_c_major = ((uint8_t)(((uint8_t)(v_c8 >> 5u))));
+          v_c_minor = ((uint8_t)(v_c8 & 31u));
           if (v_c_minor < 24u) {
             v_string_length = ((uint64_t)(v_c_minor));
           } else {
@@ -32667,7 +34985,7 @@
               goto label__goto_parsed_a_leaf_value__break;
             } else if (v_c_minor < 24u) {
               *iop_a_dst++ = wuffs_base__make_token(
-                  (((uint64_t)(WUFFS_CBOR__LITERALS[(v_c_minor & 3u)])) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
+                  (((uint64_t)(WUFFS_CBOR__LITERALS[((uint8_t)(v_c_minor & 3u))])) << WUFFS_BASE__TOKEN__VALUE_MINOR__SHIFT) |
                   (((uint64_t)(1u)) << WUFFS_BASE__TOKEN__LENGTH__SHIFT));
               goto label__goto_parsed_a_leaf_value__break;
             } else if (v_c_minor == 24u) {
@@ -32783,18 +35101,18 @@
     self->private_impl.f_end_of_data = true;
 
     ok:
-    self->private_impl.p_decode_tokens[0] = 0;
+    self->private_impl.p_decode_tokens = 0;
     goto exit;
   }
 
   goto suspend;
   suspend:
-  self->private_impl.p_decode_tokens[0] = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
+  self->private_impl.p_decode_tokens = wuffs_base__status__is_suspension(&status) ? coro_susp_point : 0;
   self->private_impl.active_coroutine = wuffs_base__status__is_suspension(&status) ? 1 : 0;
-  self->private_data.s_decode_tokens[0].v_string_length = v_string_length;
-  self->private_data.s_decode_tokens[0].v_depth = v_depth;
-  self->private_data.s_decode_tokens[0].v_tagged = v_tagged;
-  self->private_data.s_decode_tokens[0].v_indefinite_string_major_type = v_indefinite_string_major_type;
+  self->private_data.s_decode_tokens.v_string_length = v_string_length;
+  self->private_data.s_decode_tokens.v_depth = v_depth;
+  self->private_data.s_decode_tokens.v_tagged = v_tagged;
+  self->private_data.s_decode_tokens.v_indefinite_string_major_type = v_indefinite_string_major_type;
 
   goto exit;
   exit:
@@ -32822,559 +35140,559 @@
 static const uint32_t
 WUFFS_CRC32__IEEE_TABLE[16][256] WUFFS_BASE__POTENTIALLY_UNUSED = {
   {
-    0, 1996959894, 3993919788, 2567524794, 124634137, 1886057615, 3915621685, 2657392035,
-    249268274, 2044508324, 3772115230, 2547177864, 162941995, 2125561021, 3887607047, 2428444049,
-    498536548, 1789927666, 4089016648, 2227061214, 450548861, 1843258603, 4107580753, 2211677639,
-    325883990, 1684777152, 4251122042, 2321926636, 335633487, 1661365465, 4195302755, 2366115317,
-    997073096, 1281953886, 3579855332, 2724688242, 1006888145, 1258607687, 3524101629, 2768942443,
-    901097722, 1119000684, 3686517206, 2898065728, 853044451, 1172266101, 3705015759, 2882616665,
-    651767980, 1373503546, 3369554304, 3218104598, 565507253, 1454621731, 3485111705, 3099436303,
-    671266974, 1594198024, 3322730930, 2970347812, 795835527, 1483230225, 3244367275, 3060149565,
-    1994146192, 31158534, 2563907772, 4023717930, 1907459465, 112637215, 2680153253, 3904427059,
-    2013776290, 251722036, 2517215374, 3775830040, 2137656763, 141376813, 2439277719, 3865271297,
-    1802195444, 476864866, 2238001368, 4066508878, 1812370925, 453092731, 2181625025, 4111451223,
-    1706088902, 314042704, 2344532202, 4240017532, 1658658271, 366619977, 2362670323, 4224994405,
-    1303535960, 984961486, 2747007092, 3569037538, 1256170817, 1037604311, 2765210733, 3554079995,
-    1131014506, 879679996, 2909243462, 3663771856, 1141124467, 855842277, 2852801631, 3708648649,
-    1342533948, 654459306, 3188396048, 3373015174, 1466479909, 544179635, 3110523913, 3462522015,
-    1591671054, 702138776, 2966460450, 3352799412, 1504918807, 783551873, 3082640443, 3233442989,
-    3988292384, 2596254646, 62317068, 1957810842, 3939845945, 2647816111, 81470997, 1943803523,
-    3814918930, 2489596804, 225274430, 2053790376, 3826175755, 2466906013, 167816743, 2097651377,
-    4027552580, 2265490386, 503444072, 1762050814, 4150417245, 2154129355, 426522225, 1852507879,
-    4275313526, 2312317920, 282753626, 1742555852, 4189708143, 2394877945, 397917763, 1622183637,
-    3604390888, 2714866558, 953729732, 1340076626, 3518719985, 2797360999, 1068828381, 1219638859,
-    3624741850, 2936675148, 906185462, 1090812512, 3747672003, 2825379669, 829329135, 1181335161,
-    3412177804, 3160834842, 628085408, 1382605366, 3423369109, 3138078467, 570562233, 1426400815,
-    3317316542, 2998733608, 733239954, 1555261956, 3268935591, 3050360625, 752459403, 1541320221,
-    2607071920, 3965973030, 1969922972, 40735498, 2617837225, 3943577151, 1913087877, 83908371,
-    2512341634, 3803740692, 2075208622, 213261112, 2463272603, 3855990285, 2094854071, 198958881,
-    2262029012, 4057260610, 1759359992, 534414190, 2176718541, 4139329115, 1873836001, 414664567,
-    2282248934, 4279200368, 1711684554, 285281116, 2405801727, 4167216745, 1634467795, 376229701,
-    2685067896, 3608007406, 1308918612, 956543938, 2808555105, 3495958263, 1231636301, 1047427035,
-    2932959818, 3654703836, 1088359270, 936918000, 2847714899, 3736837829, 1202900863, 817233897,
-    3183342108, 3401237130, 1404277552, 615818150, 3134207493, 3453421203, 1423857449, 601450431,
-    3009837614, 3294710456, 1567103746, 711928724, 3020668471, 3272380065, 1510334235, 755167117,
+    0u, 1996959894u, 3993919788u, 2567524794u, 124634137u, 1886057615u, 3915621685u, 2657392035u,
+    249268274u, 2044508324u, 3772115230u, 2547177864u, 162941995u, 2125561021u, 3887607047u, 2428444049u,
+    498536548u, 1789927666u, 4089016648u, 2227061214u, 450548861u, 1843258603u, 4107580753u, 2211677639u,
+    325883990u, 1684777152u, 4251122042u, 2321926636u, 335633487u, 1661365465u, 4195302755u, 2366115317u,
+    997073096u, 1281953886u, 3579855332u, 2724688242u, 1006888145u, 1258607687u, 3524101629u, 2768942443u,
+    901097722u, 1119000684u, 3686517206u, 2898065728u, 853044451u, 1172266101u, 3705015759u, 2882616665u,
+    651767980u, 1373503546u, 3369554304u, 3218104598u, 565507253u, 1454621731u, 3485111705u, 3099436303u,
+    671266974u, 1594198024u, 3322730930u, 2970347812u, 795835527u, 1483230225u, 3244367275u, 3060149565u,
+    1994146192u, 31158534u, 2563907772u, 4023717930u, 1907459465u, 112637215u, 2680153253u, 3904427059u,
+    2013776290u, 251722036u, 2517215374u, 3775830040u, 2137656763u, 141376813u, 2439277719u, 3865271297u,
+    1802195444u, 476864866u, 2238001368u, 4066508878u, 1812370925u, 453092731u, 2181625025u, 4111451223u,
+    1706088902u, 314042704u, 2344532202u, 4240017532u, 1658658271u, 366619977u, 2362670323u, 4224994405u,
+    1303535960u, 984961486u, 2747007092u, 3569037538u, 1256170817u, 1037604311u, 2765210733u, 3554079995u,
+    1131014506u, 879679996u, 2909243462u, 3663771856u, 1141124467u, 855842277u, 2852801631u, 3708648649u,
+    1342533948u, 654459306u, 3188396048u, 3373015174u, 1466479909u, 544179635u, 3110523913u, 3462522015u,
+    1591671054u, 702138776u, 2966460450u, 3352799412u, 1504918807u, 783551873u, 3082640443u, 3233442989u,
+    3988292384u, 2596254646u, 62317068u, 1957810842u, 3939845945u, 2647816111u, 81470997u, 1943803523u,
+    3814918930u, 2489596804u, 225274430u, 2053790376u, 3826175755u, 2466906013u, 167816743u, 2097651377u,
+    4027552580u, 2265490386u, 503444072u, 1762050814u, 4150417245u, 2154129355u, 426522225u, 1852507879u,
+    4275313526u, 2312317920u, 282753626u, 1742555852u, 4189708143u, 2394877945u, 397917763u, 1622183637u,
+    3604390888u, 2714866558u, 953729732u, 1340076626u, 3518719985u, 2797360999u, 1068828381u, 1219638859u,
+    3624741850u, 2936675148u, 906185462u, 1090812512u, 3747672003u, 2825379669u, 829329135u, 1181335161u,
+    3412177804u, 3160834842u, 628085408u, 1382605366u, 3423369109u, 3138078467u, 570562233u, 1426400815u,
+    3317316542u, 2998733608u, 733239954u, 1555261956u, 3268935591u, 3050360625u, 752459403u, 1541320221u,
+    2607071920u, 3965973030u, 1969922972u, 40735498u, 2617837225u, 3943577151u, 1913087877u, 83908371u,
+    2512341634u, 3803740692u, 2075208622u, 213261112u, 2463272603u, 3855990285u, 2094854071u, 198958881u,
+    2262029012u, 4057260610u, 1759359992u, 534414190u, 2176718541u, 4139329115u, 1873836001u, 414664567u,
+    2282248934u, 4279200368u, 1711684554u, 285281116u, 2405801727u, 4167216745u, 1634467795u, 376229701u,
+    2685067896u, 3608007406u, 1308918612u, 956543938u, 2808555105u, 3495958263u, 1231636301u, 1047427035u,
+    2932959818u, 3654703836u, 1088359270u, 936918000u, 2847714899u, 3736837829u, 1202900863u, 817233897u,
+    3183342108u, 3401237130u, 1404277552u, 615818150u, 3134207493u, 3453421203u, 1423857449u, 601450431u,
+    3009837614u, 3294710456u, 1567103746u, 711928724u, 3020668471u, 3272380065u, 1510334235u, 755167117u,
   }, {
-    0, 421212481, 842424962, 724390851, 1684849924, 2105013317, 1448781702, 1329698503,
-    3369699848, 3519200073, 4210026634, 3824474571, 2897563404, 3048111693, 2659397006, 2274893007,
-    1254232657, 1406739216, 2029285587, 1643069842, 783210325, 934667796, 479770071, 92505238,
-    2182846553, 2600511768, 2955803355, 2838940570, 3866582365, 4285295644, 3561045983, 3445231262,
-    2508465314, 2359236067, 2813478432, 3198777185, 4058571174, 3908292839, 3286139684, 3670389349,
-    1566420650, 1145479147, 1869335592, 1987116393, 959540142, 539646703, 185010476, 303839341,
-    3745920755, 3327985586, 3983561841, 4100678960, 3140154359, 2721170102, 2300350837, 2416418868,
-    396344571, 243568058, 631889529, 1018359608, 1945336319, 1793607870, 1103436669, 1490954812,
-    4034481925, 3915546180, 3259968903, 3679722694, 2484439553, 2366552896, 2787371139, 3208174018,
-    950060301, 565965900, 177645455, 328046286, 1556873225, 1171730760, 1861902987, 2011255754,
-    3132841300, 2745199637, 2290958294, 2442530455, 3738671184, 3352078609, 3974232786, 4126854035,
-    1919080284, 1803150877, 1079293406, 1498383519, 370020952, 253043481, 607678682, 1025720731,
-    1711106983, 2095471334, 1472923941, 1322268772, 26324643, 411738082, 866634785, 717028704,
-    2904875439, 3024081134, 2668790573, 2248782444, 3376948395, 3495106026, 4219356713, 3798300520,
-    792689142, 908347575, 487136116, 68299317, 1263779058, 1380486579, 2036719216, 1618931505,
-    3890672638, 4278043327, 3587215740, 3435896893, 2206873338, 2593195963, 2981909624, 2829542713,
-    998479947, 580430090, 162921161, 279890824, 1609522511, 1190423566, 1842954189, 1958874764,
-    4082766403, 3930137346, 3245109441, 3631694208, 2536953671, 2385372678, 2768287173, 3155920004,
-    1900120602, 1750776667, 1131931800, 1517083097, 355290910, 204897887, 656092572, 1040194781,
-    3113746450, 2692952403, 2343461520, 2461357009, 3723805974, 3304059991, 4022511508, 4141455061,
-    2919742697, 3072101800, 2620513899, 2234183466, 3396041197, 3547351212, 4166851439, 3779471918,
-    1725839073, 2143618976, 1424512099, 1307796770, 45282277, 464110244, 813994343, 698327078,
-    3838160568, 4259225593, 3606301754, 3488152955, 2158586812, 2578602749, 2996767038, 2877569151,
-    740041904, 889656817, 506086962, 120682355, 1215357364, 1366020341, 2051441462, 1667084919,
-    3422213966, 3538019855, 4190942668, 3772220557, 2945847882, 3062702859, 2644537544, 2226864521,
-    52649286, 439905287, 823476164, 672009861, 1733269570, 2119477507, 1434057408, 1281543041,
-    2167981343, 2552493150, 3004082077, 2853541596, 3847487515, 4233048410, 3613549209, 3464057816,
-    1239502615, 1358593622, 2077699477, 1657543892, 764250643, 882293586, 532408465, 111204816,
-    1585378284, 1197851309, 1816695150, 1968414767, 974272232, 587794345, 136598634, 289367339,
-    2527558116, 2411481253, 2760973158, 3179948583, 4073438432, 3956313505, 3237863010, 3655790371,
-    347922877, 229101820, 646611775, 1066513022, 1892689081, 1774917112, 1122387515, 1543337850,
-    3697634229, 3313392372, 3998419255, 4148705398, 3087642289, 2702352368, 2319436851, 2468674930,
+    0u, 421212481u, 842424962u, 724390851u, 1684849924u, 2105013317u, 1448781702u, 1329698503u,
+    3369699848u, 3519200073u, 4210026634u, 3824474571u, 2897563404u, 3048111693u, 2659397006u, 2274893007u,
+    1254232657u, 1406739216u, 2029285587u, 1643069842u, 783210325u, 934667796u, 479770071u, 92505238u,
+    2182846553u, 2600511768u, 2955803355u, 2838940570u, 3866582365u, 4285295644u, 3561045983u, 3445231262u,
+    2508465314u, 2359236067u, 2813478432u, 3198777185u, 4058571174u, 3908292839u, 3286139684u, 3670389349u,
+    1566420650u, 1145479147u, 1869335592u, 1987116393u, 959540142u, 539646703u, 185010476u, 303839341u,
+    3745920755u, 3327985586u, 3983561841u, 4100678960u, 3140154359u, 2721170102u, 2300350837u, 2416418868u,
+    396344571u, 243568058u, 631889529u, 1018359608u, 1945336319u, 1793607870u, 1103436669u, 1490954812u,
+    4034481925u, 3915546180u, 3259968903u, 3679722694u, 2484439553u, 2366552896u, 2787371139u, 3208174018u,
+    950060301u, 565965900u, 177645455u, 328046286u, 1556873225u, 1171730760u, 1861902987u, 2011255754u,
+    3132841300u, 2745199637u, 2290958294u, 2442530455u, 3738671184u, 3352078609u, 3974232786u, 4126854035u,
+    1919080284u, 1803150877u, 1079293406u, 1498383519u, 370020952u, 253043481u, 607678682u, 1025720731u,
+    1711106983u, 2095471334u, 1472923941u, 1322268772u, 26324643u, 411738082u, 866634785u, 717028704u,
+    2904875439u, 3024081134u, 2668790573u, 2248782444u, 3376948395u, 3495106026u, 4219356713u, 3798300520u,
+    792689142u, 908347575u, 487136116u, 68299317u, 1263779058u, 1380486579u, 2036719216u, 1618931505u,
+    3890672638u, 4278043327u, 3587215740u, 3435896893u, 2206873338u, 2593195963u, 2981909624u, 2829542713u,
+    998479947u, 580430090u, 162921161u, 279890824u, 1609522511u, 1190423566u, 1842954189u, 1958874764u,
+    4082766403u, 3930137346u, 3245109441u, 3631694208u, 2536953671u, 2385372678u, 2768287173u, 3155920004u,
+    1900120602u, 1750776667u, 1131931800u, 1517083097u, 355290910u, 204897887u, 656092572u, 1040194781u,
+    3113746450u, 2692952403u, 2343461520u, 2461357009u, 3723805974u, 3304059991u, 4022511508u, 4141455061u,
+    2919742697u, 3072101800u, 2620513899u, 2234183466u, 3396041197u, 3547351212u, 4166851439u, 3779471918u,
+    1725839073u, 2143618976u, 1424512099u, 1307796770u, 45282277u, 464110244u, 813994343u, 698327078u,
+    3838160568u, 4259225593u, 3606301754u, 3488152955u, 2158586812u, 2578602749u, 2996767038u, 2877569151u,
+    740041904u, 889656817u, 506086962u, 120682355u, 1215357364u, 1366020341u, 2051441462u, 1667084919u,
+    3422213966u, 3538019855u, 4190942668u, 3772220557u, 2945847882u, 3062702859u, 2644537544u, 2226864521u,
+    52649286u, 439905287u, 823476164u, 672009861u, 1733269570u, 2119477507u, 1434057408u, 1281543041u,
+    2167981343u, 2552493150u, 3004082077u, 2853541596u, 3847487515u, 4233048410u, 3613549209u, 3464057816u,
+    1239502615u, 1358593622u, 2077699477u, 1657543892u, 764250643u, 882293586u, 532408465u, 111204816u,
+    1585378284u, 1197851309u, 1816695150u, 1968414767u, 974272232u, 587794345u, 136598634u, 289367339u,
+    2527558116u, 2411481253u, 2760973158u, 3179948583u, 4073438432u, 3956313505u, 3237863010u, 3655790371u,
+    347922877u, 229101820u, 646611775u, 1066513022u, 1892689081u, 1774917112u, 1122387515u, 1543337850u,
+    3697634229u, 3313392372u, 3998419255u, 4148705398u, 3087642289u, 2702352368u, 2319436851u, 2468674930u,
   }, {
-    0, 29518391, 59036782, 38190681, 118073564, 114017003, 76381362, 89069189,
-    236147128, 265370511, 228034006, 206958561, 152762724, 148411219, 178138378, 190596925,
-    472294256, 501532999, 530741022, 509615401, 456068012, 451764635, 413917122, 426358261,
-    305525448, 334993663, 296822438, 275991697, 356276756, 352202787, 381193850, 393929805,
-    944588512, 965684439, 1003065998, 973863097, 1061482044, 1049003019, 1019230802, 1023561829,
-    912136024, 933002607, 903529270, 874031361, 827834244, 815125939, 852716522, 856752605,
-    611050896, 631869351, 669987326, 640506825, 593644876, 580921211, 551983394, 556069653,
-    712553512, 733666847, 704405574, 675154545, 762387700, 749958851, 787859610, 792175277,
-    1889177024, 1901651959, 1931368878, 1927033753, 2006131996, 1985040171, 1947726194, 1976933189,
-    2122964088, 2135668303, 2098006038, 2093965857, 2038461604, 2017599123, 2047123658, 2076625661,
-    1824272048, 1836991623, 1866005214, 1861914857, 1807058540, 1786244187, 1748062722, 1777547317,
-    1655668488, 1668093247, 1630251878, 1625932113, 1705433044, 1684323811, 1713505210, 1742760333,
-    1222101792, 1226154263, 1263738702, 1251046777, 1339974652, 1310460363, 1281013650, 1301863845,
-    1187289752, 1191637167, 1161842422, 1149379777, 1103966788, 1074747507, 1112139306, 1133218845,
-    1425107024, 1429406311, 1467333694, 1454888457, 1408811148, 1379576507, 1350309090, 1371438805,
-    1524775400, 1528845279, 1499917702, 1487177649, 1575719220, 1546255107, 1584350554, 1605185389,
-    3778354048, 3774312887, 3803303918, 3816007129, 3862737756, 3892238699, 3854067506, 3833203973,
-    4012263992, 4007927823, 3970080342, 3982554209, 3895452388, 3924658387, 3953866378, 3932773565,
-    4245928176, 4241609415, 4271336606, 4283762345, 4196012076, 4225268251, 4187931714, 4166823541,
-    4076923208, 4072833919, 4035198246, 4047918865, 4094247316, 4123732899, 4153251322, 4132437965,
-    3648544096, 3636082519, 3673983246, 3678331705, 3732010428, 3753090955, 3723829714, 3694611429,
-    3614117080, 3601426159, 3572488374, 3576541825, 3496125444, 3516976691, 3555094634, 3525581405,
-    3311336976, 3298595879, 3336186494, 3340255305, 3260503756, 3281337595, 3251864226, 3222399125,
-    3410866088, 3398419871, 3368647622, 3372945905, 3427010420, 3448139075, 3485520666, 3456284973,
-    2444203584, 2423127159, 2452308526, 2481530905, 2527477404, 2539934891, 2502093554, 2497740997,
-    2679949304, 2659102159, 2620920726, 2650438049, 2562027300, 2574714131, 2603727690, 2599670141,
-    2374579504, 2353749767, 2383274334, 2412743529, 2323684844, 2336421851, 2298759554, 2294686645,
-    2207933576, 2186809023, 2149495014, 2178734801, 2224278612, 2236720739, 2266437690, 2262135309,
-    2850214048, 2820717207, 2858812622, 2879680249, 2934667388, 2938704459, 2909776914, 2897069605,
-    2817622296, 2788420399, 2759153014, 2780249921, 2700618180, 2704950259, 2742877610, 2730399645,
-    3049550800, 3020298727, 3057690558, 3078802825, 2999835404, 3004150075, 2974355298, 2961925461,
-    3151438440, 3121956959, 3092510214, 3113327665, 3168701108, 3172786307, 3210370778, 3197646061,
+    0u, 29518391u, 59036782u, 38190681u, 118073564u, 114017003u, 76381362u, 89069189u,
+    236147128u, 265370511u, 228034006u, 206958561u, 152762724u, 148411219u, 178138378u, 190596925u,
+    472294256u, 501532999u, 530741022u, 509615401u, 456068012u, 451764635u, 413917122u, 426358261u,
+    305525448u, 334993663u, 296822438u, 275991697u, 356276756u, 352202787u, 381193850u, 393929805u,
+    944588512u, 965684439u, 1003065998u, 973863097u, 1061482044u, 1049003019u, 1019230802u, 1023561829u,
+    912136024u, 933002607u, 903529270u, 874031361u, 827834244u, 815125939u, 852716522u, 856752605u,
+    611050896u, 631869351u, 669987326u, 640506825u, 593644876u, 580921211u, 551983394u, 556069653u,
+    712553512u, 733666847u, 704405574u, 675154545u, 762387700u, 749958851u, 787859610u, 792175277u,
+    1889177024u, 1901651959u, 1931368878u, 1927033753u, 2006131996u, 1985040171u, 1947726194u, 1976933189u,
+    2122964088u, 2135668303u, 2098006038u, 2093965857u, 2038461604u, 2017599123u, 2047123658u, 2076625661u,
+    1824272048u, 1836991623u, 1866005214u, 1861914857u, 1807058540u, 1786244187u, 1748062722u, 1777547317u,
+    1655668488u, 1668093247u, 1630251878u, 1625932113u, 1705433044u, 1684323811u, 1713505210u, 1742760333u,
+    1222101792u, 1226154263u, 1263738702u, 1251046777u, 1339974652u, 1310460363u, 1281013650u, 1301863845u,
+    1187289752u, 1191637167u, 1161842422u, 1149379777u, 1103966788u, 1074747507u, 1112139306u, 1133218845u,
+    1425107024u, 1429406311u, 1467333694u, 1454888457u, 1408811148u, 1379576507u, 1350309090u, 1371438805u,
+    1524775400u, 1528845279u, 1499917702u, 1487177649u, 1575719220u, 1546255107u, 1584350554u, 1605185389u,
+    3778354048u, 3774312887u, 3803303918u, 3816007129u, 3862737756u, 3892238699u, 3854067506u, 3833203973u,
+    4012263992u, 4007927823u, 3970080342u, 3982554209u, 3895452388u, 3924658387u, 3953866378u, 3932773565u,
+    4245928176u, 4241609415u, 4271336606u, 4283762345u, 4196012076u, 4225268251u, 4187931714u, 4166823541u,
+    4076923208u, 4072833919u, 4035198246u, 4047918865u, 4094247316u, 4123732899u, 4153251322u, 4132437965u,
+    3648544096u, 3636082519u, 3673983246u, 3678331705u, 3732010428u, 3753090955u, 3723829714u, 3694611429u,
+    3614117080u, 3601426159u, 3572488374u, 3576541825u, 3496125444u, 3516976691u, 3555094634u, 3525581405u,
+    3311336976u, 3298595879u, 3336186494u, 3340255305u, 3260503756u, 3281337595u, 3251864226u, 3222399125u,
+    3410866088u, 3398419871u, 3368647622u, 3372945905u, 3427010420u, 3448139075u, 3485520666u, 3456284973u,
+    2444203584u, 2423127159u, 2452308526u, 2481530905u, 2527477404u, 2539934891u, 2502093554u, 2497740997u,
+    2679949304u, 2659102159u, 2620920726u, 2650438049u, 2562027300u, 2574714131u, 2603727690u, 2599670141u,
+    2374579504u, 2353749767u, 2383274334u, 2412743529u, 2323684844u, 2336421851u, 2298759554u, 2294686645u,
+    2207933576u, 2186809023u, 2149495014u, 2178734801u, 2224278612u, 2236720739u, 2266437690u, 2262135309u,
+    2850214048u, 2820717207u, 2858812622u, 2879680249u, 2934667388u, 2938704459u, 2909776914u, 2897069605u,
+    2817622296u, 2788420399u, 2759153014u, 2780249921u, 2700618180u, 2704950259u, 2742877610u, 2730399645u,
+    3049550800u, 3020298727u, 3057690558u, 3078802825u, 2999835404u, 3004150075u, 2974355298u, 2961925461u,
+    3151438440u, 3121956959u, 3092510214u, 3113327665u, 3168701108u, 3172786307u, 3210370778u, 3197646061u,
   }, {
-    0, 3099354981, 2852767883, 313896942, 2405603159, 937357362, 627793884, 2648127673,
-    3316918511, 2097696650, 1874714724, 3607201537, 1255587768, 4067088605, 3772741427, 1482887254,
-    1343838111, 3903140090, 4195393300, 1118632049, 3749429448, 1741137837, 1970407491, 3452858150,
-    2511175536, 756094997, 1067759611, 2266550430, 449832999, 2725482306, 2965774508, 142231497,
-    2687676222, 412010587, 171665333, 2995192016, 793786473, 2548850444, 2237264098, 1038456711,
-    1703315409, 3711623348, 3482275674, 1999841343, 3940814982, 1381529571, 1089329165, 4166106984,
-    4029413537, 1217896388, 1512189994, 3802027855, 2135519222, 3354724499, 3577784189, 1845280792,
-    899665998, 2367928107, 2677414085, 657096608, 3137160985, 37822588, 284462994, 2823350519,
-    2601801789, 598228824, 824021174, 2309093331, 343330666, 2898962447, 3195996129, 113467524,
-    1587572946, 3860600759, 4104763481, 1276501820, 3519211397, 1769898208, 2076913422, 3279374443,
-    3406630818, 1941006535, 1627703081, 3652755532, 1148164341, 4241751952, 3999682686, 1457141531,
-    247015245, 3053797416, 2763059142, 470583459, 2178658330, 963106687, 735213713, 2473467892,
-    992409347, 2207944806, 2435792776, 697522413, 3024379988, 217581361, 508405983, 2800865210,
-    4271038444, 1177467017, 1419450215, 3962007554, 1911572667, 3377213406, 3690561584, 1665525589,
-    1799331996, 3548628985, 3241568279, 2039091058, 3831314379, 1558270126, 1314193216, 4142438437,
-    2928380019, 372764438, 75645176, 3158189981, 568925988, 2572515393, 2346768303, 861712586,
-    3982079547, 1441124702, 1196457648, 4293663189, 1648042348, 3666298377, 3358779879, 1888390786,
-    686661332, 2421291441, 2196002399, 978858298, 2811169155, 523464422, 226935048, 3040519789,
-    3175145892, 100435649, 390670639, 2952089162, 841119475, 2325614998, 2553003640, 546822429,
-    2029308235, 3225988654, 3539796416, 1782671013, 4153826844, 1328167289, 1570739863, 3844338162,
-    1298864389, 4124540512, 3882013070, 1608431339, 3255406162, 2058742071, 1744848601, 3501990332,
-    2296328682, 811816591, 584513889, 2590678532, 129869501, 3204563416, 2914283062, 352848211,
-    494030490, 2781751807, 3078325777, 264757620, 2450577869, 715964072, 941166918, 2158327331,
-    3636881013, 1618608400, 1926213374, 3396585883, 1470427426, 4011365959, 4255988137, 1158766284,
-    1984818694, 3471935843, 3695453837, 1693991400, 4180638033, 1100160564, 1395044826, 3952793279,
-    3019491049, 189112716, 435162722, 2706139399, 1016811966, 2217162459, 2526189877, 774831696,
-    643086745, 2666061564, 2354934034, 887166583, 2838900430, 294275499, 54519365, 3145957664,
-    3823145334, 1532818963, 1240029693, 4048895640, 1820460577, 3560857924, 3331051178, 2117577167,
-    3598663992, 1858283101, 2088143283, 3301633750, 1495127663, 3785470218, 4078182116, 1269332353,
-    332098007, 2876706482, 3116540252, 25085497, 2628386432, 605395429, 916469259, 2384220526,
-    2254837415, 1054503362, 745528876, 2496903497, 151290352, 2981684885, 2735556987, 464596510,
-    1137851976, 4218313005, 3923506883, 1365741990, 3434129695, 1946996346, 1723425172, 3724871409,
+    0u, 3099354981u, 2852767883u, 313896942u, 2405603159u, 937357362u, 627793884u, 2648127673u,
+    3316918511u, 2097696650u, 1874714724u, 3607201537u, 1255587768u, 4067088605u, 3772741427u, 1482887254u,
+    1343838111u, 3903140090u, 4195393300u, 1118632049u, 3749429448u, 1741137837u, 1970407491u, 3452858150u,
+    2511175536u, 756094997u, 1067759611u, 2266550430u, 449832999u, 2725482306u, 2965774508u, 142231497u,
+    2687676222u, 412010587u, 171665333u, 2995192016u, 793786473u, 2548850444u, 2237264098u, 1038456711u,
+    1703315409u, 3711623348u, 3482275674u, 1999841343u, 3940814982u, 1381529571u, 1089329165u, 4166106984u,
+    4029413537u, 1217896388u, 1512189994u, 3802027855u, 2135519222u, 3354724499u, 3577784189u, 1845280792u,
+    899665998u, 2367928107u, 2677414085u, 657096608u, 3137160985u, 37822588u, 284462994u, 2823350519u,
+    2601801789u, 598228824u, 824021174u, 2309093331u, 343330666u, 2898962447u, 3195996129u, 113467524u,
+    1587572946u, 3860600759u, 4104763481u, 1276501820u, 3519211397u, 1769898208u, 2076913422u, 3279374443u,
+    3406630818u, 1941006535u, 1627703081u, 3652755532u, 1148164341u, 4241751952u, 3999682686u, 1457141531u,
+    247015245u, 3053797416u, 2763059142u, 470583459u, 2178658330u, 963106687u, 735213713u, 2473467892u,
+    992409347u, 2207944806u, 2435792776u, 697522413u, 3024379988u, 217581361u, 508405983u, 2800865210u,
+    4271038444u, 1177467017u, 1419450215u, 3962007554u, 1911572667u, 3377213406u, 3690561584u, 1665525589u,
+    1799331996u, 3548628985u, 3241568279u, 2039091058u, 3831314379u, 1558270126u, 1314193216u, 4142438437u,
+    2928380019u, 372764438u, 75645176u, 3158189981u, 568925988u, 2572515393u, 2346768303u, 861712586u,
+    3982079547u, 1441124702u, 1196457648u, 4293663189u, 1648042348u, 3666298377u, 3358779879u, 1888390786u,
+    686661332u, 2421291441u, 2196002399u, 978858298u, 2811169155u, 523464422u, 226935048u, 3040519789u,
+    3175145892u, 100435649u, 390670639u, 2952089162u, 841119475u, 2325614998u, 2553003640u, 546822429u,
+    2029308235u, 3225988654u, 3539796416u, 1782671013u, 4153826844u, 1328167289u, 1570739863u, 3844338162u,
+    1298864389u, 4124540512u, 3882013070u, 1608431339u, 3255406162u, 2058742071u, 1744848601u, 3501990332u,
+    2296328682u, 811816591u, 584513889u, 2590678532u, 129869501u, 3204563416u, 2914283062u, 352848211u,
+    494030490u, 2781751807u, 3078325777u, 264757620u, 2450577869u, 715964072u, 941166918u, 2158327331u,
+    3636881013u, 1618608400u, 1926213374u, 3396585883u, 1470427426u, 4011365959u, 4255988137u, 1158766284u,
+    1984818694u, 3471935843u, 3695453837u, 1693991400u, 4180638033u, 1100160564u, 1395044826u, 3952793279u,
+    3019491049u, 189112716u, 435162722u, 2706139399u, 1016811966u, 2217162459u, 2526189877u, 774831696u,
+    643086745u, 2666061564u, 2354934034u, 887166583u, 2838900430u, 294275499u, 54519365u, 3145957664u,
+    3823145334u, 1532818963u, 1240029693u, 4048895640u, 1820460577u, 3560857924u, 3331051178u, 2117577167u,
+    3598663992u, 1858283101u, 2088143283u, 3301633750u, 1495127663u, 3785470218u, 4078182116u, 1269332353u,
+    332098007u, 2876706482u, 3116540252u, 25085497u, 2628386432u, 605395429u, 916469259u, 2384220526u,
+    2254837415u, 1054503362u, 745528876u, 2496903497u, 151290352u, 2981684885u, 2735556987u, 464596510u,
+    1137851976u, 4218313005u, 3923506883u, 1365741990u, 3434129695u, 1946996346u, 1723425172u, 3724871409u,
   }, {
-    0, 1029712304, 2059424608, 1201699536, 4118849216, 3370159984, 2403399072, 2988497936,
-    812665793, 219177585, 1253054625, 2010132753, 3320900865, 4170237105, 3207642721, 2186319825,
-    1625331586, 1568718386, 438355170, 658566482, 2506109250, 2818578674, 4020265506, 3535817618,
-    1351670851, 1844508147, 709922595, 389064339, 2769320579, 2557498163, 3754961379, 3803185235,
-    3250663172, 4238411444, 3137436772, 2254525908, 876710340, 153198708, 1317132964, 1944187668,
-    4054934725, 3436268917, 2339452837, 3054575125, 70369797, 961670069, 2129760613, 1133623509,
-    2703341702, 2621542710, 3689016294, 3867263574, 1419845190, 1774270454, 778128678, 318858390,
-    2438067015, 2888948471, 3952189479, 3606153623, 1691440519, 1504803895, 504432359, 594620247,
-    1492342857, 1704161785, 573770537, 525542041, 2910060169, 2417219385, 3618876905, 3939730521,
-    1753420680, 1440954936, 306397416, 790849880, 2634265928, 2690882808, 3888375336, 3668168600,
-    940822475, 91481723, 1121164459, 2142483739, 3448989963, 4042473659, 3075684971, 2318603227,
-    140739594, 889433530, 1923340138, 1338244826, 4259521226, 3229813626, 2267247018, 3124975642,
-    2570221389, 2756861693, 3824297005, 3734113693, 1823658381, 1372780605, 376603373, 722643805,
-    2839690380, 2485261628, 3548540908, 4007806556, 1556257356, 1638052860, 637716780, 459464860,
-    4191346895, 3300051327, 2199040943, 3195181599, 206718479, 825388991, 1989285231, 1274166495,
-    3382881038, 4106388158, 3009607790, 2382549470, 1008864718, 21111934, 1189240494, 2072147742,
-    2984685714, 2357631266, 3408323570, 4131834434, 1147541074, 2030452706, 1051084082, 63335554,
-    2174155603, 3170292451, 4216760371, 3325460867, 1947622803, 1232499747, 248909555, 867575619,
-    3506841360, 3966111392, 2881909872, 2527485376, 612794832, 434546784, 1581699760, 1663499008,
-    3782634705, 3692447073, 2612412337, 2799048193, 351717905, 697754529, 1849071985, 1398190273,
-    1881644950, 1296545318, 182963446, 931652934, 2242328918, 3100053734, 4284967478, 3255255942,
-    1079497815, 2100821479, 983009079, 133672583, 3050795671, 2293717799, 3474399735, 4067887175,
-    281479188, 765927844, 1778867060, 1466397380, 3846680276, 3626469220, 2676489652, 2733102084,
-    548881365, 500656741, 1517752501, 1729575173, 3577210133, 3898068133, 2952246901, 2459410373,
-    3910527195, 3564487019, 2480257979, 2931134987, 479546907, 569730987, 1716854139, 1530213579,
-    3647316762, 3825568426, 2745561210, 2663766474, 753206746, 293940330, 1445287610, 1799716618,
-    2314567513, 3029685993, 4080348217, 3461678473, 2088098201, 1091956777, 112560889, 1003856713,
-    3112514712, 2229607720, 3276105720, 4263857736, 1275433560, 1902492648, 918929720, 195422344,
-    685033439, 364179055, 1377080511, 1869921551, 3713294623, 3761522863, 2811507327, 2599689167,
-    413436958, 633644462, 1650777982, 1594160846, 3978570462, 3494118254, 2548332990, 2860797966,
-    1211387997, 1968470509, 854852413, 261368461, 3182753437, 2161434413, 3346310653, 4195650637,
-    2017729436, 1160000044, 42223868, 1071931724, 2378480988, 2963576044, 4144295484, 3395602316,
+    0u, 1029712304u, 2059424608u, 1201699536u, 4118849216u, 3370159984u, 2403399072u, 2988497936u,
+    812665793u, 219177585u, 1253054625u, 2010132753u, 3320900865u, 4170237105u, 3207642721u, 2186319825u,
+    1625331586u, 1568718386u, 438355170u, 658566482u, 2506109250u, 2818578674u, 4020265506u, 3535817618u,
+    1351670851u, 1844508147u, 709922595u, 389064339u, 2769320579u, 2557498163u, 3754961379u, 3803185235u,
+    3250663172u, 4238411444u, 3137436772u, 2254525908u, 876710340u, 153198708u, 1317132964u, 1944187668u,
+    4054934725u, 3436268917u, 2339452837u, 3054575125u, 70369797u, 961670069u, 2129760613u, 1133623509u,
+    2703341702u, 2621542710u, 3689016294u, 3867263574u, 1419845190u, 1774270454u, 778128678u, 318858390u,
+    2438067015u, 2888948471u, 3952189479u, 3606153623u, 1691440519u, 1504803895u, 504432359u, 594620247u,
+    1492342857u, 1704161785u, 573770537u, 525542041u, 2910060169u, 2417219385u, 3618876905u, 3939730521u,
+    1753420680u, 1440954936u, 306397416u, 790849880u, 2634265928u, 2690882808u, 3888375336u, 3668168600u,
+    940822475u, 91481723u, 1121164459u, 2142483739u, 3448989963u, 4042473659u, 3075684971u, 2318603227u,
+    140739594u, 889433530u, 1923340138u, 1338244826u, 4259521226u, 3229813626u, 2267247018u, 3124975642u,
+    2570221389u, 2756861693u, 3824297005u, 3734113693u, 1823658381u, 1372780605u, 376603373u, 722643805u,
+    2839690380u, 2485261628u, 3548540908u, 4007806556u, 1556257356u, 1638052860u, 637716780u, 459464860u,
+    4191346895u, 3300051327u, 2199040943u, 3195181599u, 206718479u, 825388991u, 1989285231u, 1274166495u,
+    3382881038u, 4106388158u, 3009607790u, 2382549470u, 1008864718u, 21111934u, 1189240494u, 2072147742u,
+    2984685714u, 2357631266u, 3408323570u, 4131834434u, 1147541074u, 2030452706u, 1051084082u, 63335554u,
+    2174155603u, 3170292451u, 4216760371u, 3325460867u, 1947622803u, 1232499747u, 248909555u, 867575619u,
+    3506841360u, 3966111392u, 2881909872u, 2527485376u, 612794832u, 434546784u, 1581699760u, 1663499008u,
+    3782634705u, 3692447073u, 2612412337u, 2799048193u, 351717905u, 697754529u, 1849071985u, 1398190273u,
+    1881644950u, 1296545318u, 182963446u, 931652934u, 2242328918u, 3100053734u, 4284967478u, 3255255942u,
+    1079497815u, 2100821479u, 983009079u, 133672583u, 3050795671u, 2293717799u, 3474399735u, 4067887175u,
+    281479188u, 765927844u, 1778867060u, 1466397380u, 3846680276u, 3626469220u, 2676489652u, 2733102084u,
+    548881365u, 500656741u, 1517752501u, 1729575173u, 3577210133u, 3898068133u, 2952246901u, 2459410373u,
+    3910527195u, 3564487019u, 2480257979u, 2931134987u, 479546907u, 569730987u, 1716854139u, 1530213579u,
+    3647316762u, 3825568426u, 2745561210u, 2663766474u, 753206746u, 293940330u, 1445287610u, 1799716618u,
+    2314567513u, 3029685993u, 4080348217u, 3461678473u, 2088098201u, 1091956777u, 112560889u, 1003856713u,
+    3112514712u, 2229607720u, 3276105720u, 4263857736u, 1275433560u, 1902492648u, 918929720u, 195422344u,
+    685033439u, 364179055u, 1377080511u, 1869921551u, 3713294623u, 3761522863u, 2811507327u, 2599689167u,
+    413436958u, 633644462u, 1650777982u, 1594160846u, 3978570462u, 3494118254u, 2548332990u, 2860797966u,
+    1211387997u, 1968470509u, 854852413u, 261368461u, 3182753437u, 2161434413u, 3346310653u, 4195650637u,
+    2017729436u, 1160000044u, 42223868u, 1071931724u, 2378480988u, 2963576044u, 4144295484u, 3395602316u,
   }, {
-    0, 3411858341, 1304994059, 2257875630, 2609988118, 1355649459, 3596215069, 486879416,
-    3964895853, 655315400, 2711298918, 1791488195, 2009251963, 3164476382, 973758832, 4048990933,
-    64357019, 3364540734, 1310630800, 2235723829, 2554806413, 1394316072, 3582976390, 517157411,
-    4018503926, 618222419, 2722963965, 1762783832, 1947517664, 3209171269, 970744811, 4068520014,
-    128714038, 3438335635, 1248109629, 2167961496, 2621261600, 1466012805, 3522553387, 447296910,
-    3959392091, 547575038, 2788632144, 1835791861, 1886307661, 3140622056, 1034314822, 4143626211,
-    75106221, 3475428360, 1236444838, 2196665603, 2682996155, 1421317662, 3525567664, 427767573,
-    3895035328, 594892389, 2782995659, 1857943406, 1941489622, 3101955187, 1047553757, 4113347960,
-    257428076, 3288652233, 1116777319, 2311878850, 2496219258, 1603640287, 3640781169, 308099796,
-    3809183745, 676813732, 2932025610, 1704983215, 2023410199, 3016104370, 894593820, 4262377657,
-    210634999, 3352484690, 1095150076, 2316991065, 2535410401, 1547934020, 3671583722, 294336591,
-    3772615322, 729897279, 2903845777, 1716123700, 2068629644, 2953845545, 914647431, 4258839074,
-    150212442, 3282623743, 1161604689, 2388688372, 2472889676, 1480171241, 3735940167, 368132066,
-    3836185911, 805002898, 2842635324, 1647574937, 2134298401, 3026852996, 855535146, 4188192143,
-    186781121, 3229539940, 1189784778, 2377547631, 2427670487, 1542429810, 3715886812, 371670393,
-    3882979244, 741170185, 2864262823, 1642462466, 2095107514, 3082559007, 824732849, 4201955092,
-    514856152, 3589064573, 1400419795, 2552522358, 2233554638, 1316849003, 3370776517, 62202976,
-    4075001525, 968836368, 3207280574, 1954014235, 1769133219, 2720925446, 616199592, 4024870413,
-    493229635, 3594175974, 1353627464, 2616354029, 2264355925, 1303087088, 3409966430, 6498043,
-    4046820398, 979978123, 3170710821, 2007099008, 1789187640, 2717386141, 661419827, 3962610838,
-    421269998, 3527459403, 1423225061, 2676515648, 2190300152, 1238466653, 3477467891, 68755798,
-    4115633027, 1041448998, 3095868040, 1943789869, 1860096405, 2776760880, 588673182, 3897205563,
-    449450869, 3516317904, 1459794558, 2623431131, 2170245475, 1242006214, 3432247400, 131015629,
-    4137259288, 1036337853, 3142660115, 1879958454, 1829294862, 2790523051, 549483013, 3952910752,
-    300424884, 3669282065, 1545650111, 2541513754, 2323209378, 1092980487, 3350330793, 216870412,
-    4256931033, 921128828, 2960342482, 2066738807, 1714085583, 2910195050, 736264132, 3770592353,
-    306060335, 3647131530, 1610005796, 2494197377, 2309971513, 1123257756, 3295149874, 255536279,
-    4268596802, 892423655, 3013951305, 2029645036, 1711070292, 2929725425, 674528607, 3815288570,
-    373562242, 3709388839, 1535949449, 2429577516, 2379569556, 1183418929, 3223189663, 188820282,
-    4195850735, 827017802, 3084859620, 2089020225, 1636228089, 2866415708, 743340786, 3876759895,
-    361896217, 3738094268, 1482340370, 2466671543, 2382584591, 1163888810, 3284924932, 144124321,
-    4190215028, 849168593, 3020503679, 2136336858, 1649465698, 2836138695, 798521449, 3838094284,
+    0u, 3411858341u, 1304994059u, 2257875630u, 2609988118u, 1355649459u, 3596215069u, 486879416u,
+    3964895853u, 655315400u, 2711298918u, 1791488195u, 2009251963u, 3164476382u, 973758832u, 4048990933u,
+    64357019u, 3364540734u, 1310630800u, 2235723829u, 2554806413u, 1394316072u, 3582976390u, 517157411u,
+    4018503926u, 618222419u, 2722963965u, 1762783832u, 1947517664u, 3209171269u, 970744811u, 4068520014u,
+    128714038u, 3438335635u, 1248109629u, 2167961496u, 2621261600u, 1466012805u, 3522553387u, 447296910u,
+    3959392091u, 547575038u, 2788632144u, 1835791861u, 1886307661u, 3140622056u, 1034314822u, 4143626211u,
+    75106221u, 3475428360u, 1236444838u, 2196665603u, 2682996155u, 1421317662u, 3525567664u, 427767573u,
+    3895035328u, 594892389u, 2782995659u, 1857943406u, 1941489622u, 3101955187u, 1047553757u, 4113347960u,
+    257428076u, 3288652233u, 1116777319u, 2311878850u, 2496219258u, 1603640287u, 3640781169u, 308099796u,
+    3809183745u, 676813732u, 2932025610u, 1704983215u, 2023410199u, 3016104370u, 894593820u, 4262377657u,
+    210634999u, 3352484690u, 1095150076u, 2316991065u, 2535410401u, 1547934020u, 3671583722u, 294336591u,
+    3772615322u, 729897279u, 2903845777u, 1716123700u, 2068629644u, 2953845545u, 914647431u, 4258839074u,
+    150212442u, 3282623743u, 1161604689u, 2388688372u, 2472889676u, 1480171241u, 3735940167u, 368132066u,
+    3836185911u, 805002898u, 2842635324u, 1647574937u, 2134298401u, 3026852996u, 855535146u, 4188192143u,
+    186781121u, 3229539940u, 1189784778u, 2377547631u, 2427670487u, 1542429810u, 3715886812u, 371670393u,
+    3882979244u, 741170185u, 2864262823u, 1642462466u, 2095107514u, 3082559007u, 824732849u, 4201955092u,
+    514856152u, 3589064573u, 1400419795u, 2552522358u, 2233554638u, 1316849003u, 3370776517u, 62202976u,
+    4075001525u, 968836368u, 3207280574u, 1954014235u, 1769133219u, 2720925446u, 616199592u, 4024870413u,
+    493229635u, 3594175974u, 1353627464u, 2616354029u, 2264355925u, 1303087088u, 3409966430u, 6498043u,
+    4046820398u, 979978123u, 3170710821u, 2007099008u, 1789187640u, 2717386141u, 661419827u, 3962610838u,
+    421269998u, 3527459403u, 1423225061u, 2676515648u, 2190300152u, 1238466653u, 3477467891u, 68755798u,
+    4115633027u, 1041448998u, 3095868040u, 1943789869u, 1860096405u, 2776760880u, 588673182u, 3897205563u,
+    449450869u, 3516317904u, 1459794558u, 2623431131u, 2170245475u, 1242006214u, 3432247400u, 131015629u,
+    4137259288u, 1036337853u, 3142660115u, 1879958454u, 1829294862u, 2790523051u, 549483013u, 3952910752u,
+    300424884u, 3669282065u, 1545650111u, 2541513754u, 2323209378u, 1092980487u, 3350330793u, 216870412u,
+    4256931033u, 921128828u, 2960342482u, 2066738807u, 1714085583u, 2910195050u, 736264132u, 3770592353u,
+    306060335u, 3647131530u, 1610005796u, 2494197377u, 2309971513u, 1123257756u, 3295149874u, 255536279u,
+    4268596802u, 892423655u, 3013951305u, 2029645036u, 1711070292u, 2929725425u, 674528607u, 3815288570u,
+    373562242u, 3709388839u, 1535949449u, 2429577516u, 2379569556u, 1183418929u, 3223189663u, 188820282u,
+    4195850735u, 827017802u, 3084859620u, 2089020225u, 1636228089u, 2866415708u, 743340786u, 3876759895u,
+    361896217u, 3738094268u, 1482340370u, 2466671543u, 2382584591u, 1163888810u, 3284924932u, 144124321u,
+    4190215028u, 849168593u, 3020503679u, 2136336858u, 1649465698u, 2836138695u, 798521449u, 3838094284u,
   }, {
-    0, 2792819636, 2543784233, 837294749, 4098827283, 1379413927, 1674589498, 3316072078,
-    871321191, 2509784531, 2758827854, 34034938, 3349178996, 1641505216, 1346337629, 4131942633,
-    1742642382, 3249117050, 4030828007, 1446413907, 2475800797, 904311657, 68069876, 2725880384,
-    1412551337, 4064729373, 3283010432, 1708771380, 2692675258, 101317902, 937551763, 2442587175,
-    3485284764, 1774858792, 1478633653, 4266992385, 1005723023, 2642744891, 2892827814, 169477906,
-    4233263099, 1512406095, 1808623314, 3451546982, 136139752, 2926205020, 2676114113, 972376437,
-    2825102674, 236236518, 1073525883, 2576072655, 1546420545, 4200303349, 3417542760, 1841601500,
-    2609703733, 1039917185, 202635804, 2858742184, 1875103526, 3384067218, 4166835727, 1579931067,
-    1141601657, 3799809741, 3549717584, 1977839588, 2957267306, 372464350, 668680259, 2175552503,
-    2011446046, 3516084394, 3766168119, 1175200131, 2209029901, 635180217, 338955812, 2990736784,
-    601221559, 2242044419, 3024812190, 306049834, 3617246628, 1911408144, 1074125965, 3866285881,
-    272279504, 3058543716, 2275784441, 567459149, 3832906691, 1107462263, 1944752874, 3583875422,
-    2343980261, 767641425, 472473036, 3126744696, 2147051766, 3649987394, 3899029983, 1309766251,
-    3092841090, 506333494, 801510315, 2310084639, 1276520081, 3932237093, 3683203000, 2113813516,
-    3966292011, 1243601823, 2079834370, 3716205238, 405271608, 3192979340, 2411259153, 701492901,
-    3750207052, 2045810168, 1209569125, 4000285905, 734575199, 2378150379, 3159862134, 438345922,
-    2283203314, 778166598, 529136603, 3120492655, 2086260449, 3660498261, 3955679176, 1303499900,
-    3153699989, 495890209, 744928700, 2316418568, 1337360518, 3921775410, 3626602927, 2120129051,
-    4022892092, 1237286280, 2018993941, 3726666913, 461853231, 3186645403, 2350400262, 711936178,
-    3693557851, 2052076527, 1270360434, 3989775046, 677911624, 2384402428, 3220639073, 427820757,
-    1202443118, 3789347034, 3493118535, 1984154099, 3018127229, 362020041, 612099668, 2181885408,
-    1950653705, 3526596285, 3822816288, 1168934804, 2148251930, 645706414, 395618355, 2984485767,
-    544559008, 2248295444, 3085590153, 295523645, 3560598451, 1917673479, 1134918298, 3855773998,
-    328860103, 3052210803, 2214924526, 577903450, 3889505748, 1101147744, 1883911421, 3594338121,
-    3424493451, 1785369663, 1535282850, 4260726038, 944946072, 2653270060, 2949491377, 163225861,
-    4294103532, 1501944408, 1752023237, 3457862513, 196998655, 2915761739, 2619532502, 978710370,
-    2881684293, 229902577, 1012666988, 2586515928, 1603020630, 4193987810, 3356702335, 1852063179,
-    2553040162, 1046169238, 263412747, 2848217023, 1818454321, 3390333573, 4227627032, 1569420204,
-    60859927, 2782375331, 2487203646, 843627658, 4159668740, 1368951216, 1617990445, 3322386585,
-    810543216, 2520310724, 2815490393, 27783917, 3288386659, 1652017111, 1402985802, 4125677310,
-    1685994201, 3255382381, 4091620336, 1435902020, 2419138250, 910562686, 128847843, 2715354199,
-    1469150398, 4058414858, 3222168983, 1719234083, 2749255853, 94984985, 876691844, 2453031472,
+    0u, 2792819636u, 2543784233u, 837294749u, 4098827283u, 1379413927u, 1674589498u, 3316072078u,
+    871321191u, 2509784531u, 2758827854u, 34034938u, 3349178996u, 1641505216u, 1346337629u, 4131942633u,
+    1742642382u, 3249117050u, 4030828007u, 1446413907u, 2475800797u, 904311657u, 68069876u, 2725880384u,
+    1412551337u, 4064729373u, 3283010432u, 1708771380u, 2692675258u, 101317902u, 937551763u, 2442587175u,
+    3485284764u, 1774858792u, 1478633653u, 4266992385u, 1005723023u, 2642744891u, 2892827814u, 169477906u,
+    4233263099u, 1512406095u, 1808623314u, 3451546982u, 136139752u, 2926205020u, 2676114113u, 972376437u,
+    2825102674u, 236236518u, 1073525883u, 2576072655u, 1546420545u, 4200303349u, 3417542760u, 1841601500u,
+    2609703733u, 1039917185u, 202635804u, 2858742184u, 1875103526u, 3384067218u, 4166835727u, 1579931067u,
+    1141601657u, 3799809741u, 3549717584u, 1977839588u, 2957267306u, 372464350u, 668680259u, 2175552503u,
+    2011446046u, 3516084394u, 3766168119u, 1175200131u, 2209029901u, 635180217u, 338955812u, 2990736784u,
+    601221559u, 2242044419u, 3024812190u, 306049834u, 3617246628u, 1911408144u, 1074125965u, 3866285881u,
+    272279504u, 3058543716u, 2275784441u, 567459149u, 3832906691u, 1107462263u, 1944752874u, 3583875422u,
+    2343980261u, 767641425u, 472473036u, 3126744696u, 2147051766u, 3649987394u, 3899029983u, 1309766251u,
+    3092841090u, 506333494u, 801510315u, 2310084639u, 1276520081u, 3932237093u, 3683203000u, 2113813516u,
+    3966292011u, 1243601823u, 2079834370u, 3716205238u, 405271608u, 3192979340u, 2411259153u, 701492901u,
+    3750207052u, 2045810168u, 1209569125u, 4000285905u, 734575199u, 2378150379u, 3159862134u, 438345922u,
+    2283203314u, 778166598u, 529136603u, 3120492655u, 2086260449u, 3660498261u, 3955679176u, 1303499900u,
+    3153699989u, 495890209u, 744928700u, 2316418568u, 1337360518u, 3921775410u, 3626602927u, 2120129051u,
+    4022892092u, 1237286280u, 2018993941u, 3726666913u, 461853231u, 3186645403u, 2350400262u, 711936178u,
+    3693557851u, 2052076527u, 1270360434u, 3989775046u, 677911624u, 2384402428u, 3220639073u, 427820757u,
+    1202443118u, 3789347034u, 3493118535u, 1984154099u, 3018127229u, 362020041u, 612099668u, 2181885408u,
+    1950653705u, 3526596285u, 3822816288u, 1168934804u, 2148251930u, 645706414u, 395618355u, 2984485767u,
+    544559008u