diff --git a/channeld/channeld_wiregen.c b/channeld/channeld_wiregen.c
index 4d4fe6c67..ebf2efcae 100644
--- a/channeld/channeld_wiregen.c
+++ b/channeld/channeld_wiregen.c
@@ -1113,4 +1113,4 @@ bool fromwire_channeld_dev_quiesce_reply(const void *p)
 		return false;
 	return cursor != NULL;
 }
-// SHA256STAMP:720f9917311384d373593dc1550619ddf461bdabde8b312ed6dc632cb7860c34
+// SHA256STAMP:fa8ee25e2f6082e9889962218e6e345dcb4430840b8f831b40cbb0c415b690b5
diff --git a/channeld/channeld_wiregen.h b/channeld/channeld_wiregen.h
index 7d6f16c54..1b4293a30 100644
--- a/channeld/channeld_wiregen.h
+++ b/channeld/channeld_wiregen.h
@@ -225,4 +225,4 @@ bool fromwire_channeld_dev_quiesce_reply(const void *p);
 
 
 #endif /* LIGHTNING_CHANNELD_CHANNELD_WIREGEN_H */
-// SHA256STAMP:720f9917311384d373593dc1550619ddf461bdabde8b312ed6dc632cb7860c34
+// SHA256STAMP:fa8ee25e2f6082e9889962218e6e345dcb4430840b8f831b40cbb0c415b690b5
diff --git a/closingd/closingd_wiregen.c b/closingd/closingd_wiregen.c
index 91f2693f8..d1a94dfb5 100644
--- a/closingd/closingd_wiregen.c
+++ b/closingd/closingd_wiregen.c
@@ -213,4 +213,4 @@ bool fromwire_closingd_complete(const void *p)
 		return false;
 	return cursor != NULL;
 }
-// SHA256STAMP:95043321951ace6f7a5ee9f1dc0ae57c8a6427644b8b79d3e08e521dc9b3b49f
+// SHA256STAMP:8a13df246be151bcef3dae15a9853016119248d330e76ab79d7013a11d5ecd23
diff --git a/closingd/closingd_wiregen.h b/closingd/closingd_wiregen.h
index ea2aa4f2e..9f46a12b9 100644
--- a/closingd/closingd_wiregen.h
+++ b/closingd/closingd_wiregen.h
@@ -56,4 +56,4 @@ bool fromwire_closingd_complete(const void *p);
 
 
 #endif /* LIGHTNING_CLOSINGD_CLOSINGD_WIREGEN_H */
-// SHA256STAMP:95043321951ace6f7a5ee9f1dc0ae57c8a6427644b8b79d3e08e521dc9b3b49f
+// SHA256STAMP:8a13df246be151bcef3dae15a9853016119248d330e76ab79d7013a11d5ecd23
diff --git a/common/peer_status_wiregen.c b/common/peer_status_wiregen.c
index 08982e737..0f12fa92a 100644
--- a/common/peer_status_wiregen.c
+++ b/common/peer_status_wiregen.c
@@ -80,4 +80,4 @@ bool fromwire_status_peer_error(const tal_t *ctx, const void *p, struct channel_
 	fromwire_u8_array(&cursor, &plen, *error_for_them, len);
 	return cursor != NULL;
 }
-// SHA256STAMP:c002247f54d5016e614dd6d757c7d06f65c713c3e19d17901f7f685a6bd4b9d9
+// SHA256STAMP:9d6739d97294bd0ec0691772616c4d3d0328d399ed2bef6c943f912aca7d438a
diff --git a/common/peer_status_wiregen.h b/common/peer_status_wiregen.h
index a95a6f275..52d7941ae 100644
--- a/common/peer_status_wiregen.h
+++ b/common/peer_status_wiregen.h
@@ -34,4 +34,4 @@ bool fromwire_status_peer_error(const tal_t *ctx, const void *p, struct channel_
 
 
 #endif /* LIGHTNING_COMMON_PEER_STATUS_WIREGEN_H */
-// SHA256STAMP:c002247f54d5016e614dd6d757c7d06f65c713c3e19d17901f7f685a6bd4b9d9
+// SHA256STAMP:9d6739d97294bd0ec0691772616c4d3d0328d399ed2bef6c943f912aca7d438a
diff --git a/common/status_wiregen.c b/common/status_wiregen.c
index e56e59aac..d97b9ee0f 100644
--- a/common/status_wiregen.c
+++ b/common/status_wiregen.c
@@ -214,4 +214,4 @@ bool fromwire_status_version(const tal_t *ctx, const void *p, wirestring **versi
  	*version = fromwire_wirestring(ctx, &cursor, &plen);
 	return cursor != NULL;
 }
-// SHA256STAMP:8e1ba9cbc812c8aad76c5049fcecefea2d706a100423c93d3c3be0afcbee851e
+// SHA256STAMP:3164c82c28124ba916aebd075baa2315cd82cee0d785908da25c6aa6c5b11f22
diff --git a/common/status_wiregen.h b/common/status_wiregen.h
index c41cb2311..9a45697e0 100644
--- a/common/status_wiregen.h
+++ b/common/status_wiregen.h
@@ -58,4 +58,4 @@ bool fromwire_status_version(const tal_t *ctx, const void *p, wirestring **versi
 
 
 #endif /* LIGHTNING_COMMON_STATUS_WIREGEN_H */
-// SHA256STAMP:8e1ba9cbc812c8aad76c5049fcecefea2d706a100423c93d3c3be0afcbee851e
+// SHA256STAMP:3164c82c28124ba916aebd075baa2315cd82cee0d785908da25c6aa6c5b11f22
diff --git a/connectd/connectd_gossipd_wiregen.c b/connectd/connectd_gossipd_wiregen.c
index 7332fec6b..ac2856c3a 100644
--- a/connectd/connectd_gossipd_wiregen.c
+++ b/connectd/connectd_gossipd_wiregen.c
@@ -161,4 +161,4 @@ bool fromwire_gossipd_get_addrs_reply(const tal_t *ctx, const void *p, struct wi
 		fromwire_wireaddr(&cursor, &plen, *addrs + i);
 	return cursor != NULL;
 }
-// SHA256STAMP:3843c1c89472b3084feca4bb6d0a39598f768d4c4ff866f8dc94169716b6fadd
+// SHA256STAMP:6bfe0677cb910aba63f79cfc4164ce26034da95e16341eab3aac6fddcc04e3e9
diff --git a/connectd/connectd_gossipd_wiregen.h b/connectd/connectd_gossipd_wiregen.h
index 2bc0fb247..5c391775a 100644
--- a/connectd/connectd_gossipd_wiregen.h
+++ b/connectd/connectd_gossipd_wiregen.h
@@ -54,4 +54,4 @@ bool fromwire_gossipd_get_addrs_reply(const tal_t *ctx, const void *p, struct wi
 
 
 #endif /* LIGHTNING_CONNECTD_CONNECTD_GOSSIPD_WIREGEN_H */
-// SHA256STAMP:3843c1c89472b3084feca4bb6d0a39598f768d4c4ff866f8dc94169716b6fadd
+// SHA256STAMP:6bfe0677cb910aba63f79cfc4164ce26034da95e16341eab3aac6fddcc04e3e9
diff --git a/connectd/connectd_wiregen.c b/connectd/connectd_wiregen.c
index a76e3e007..3ee9ea506 100644
--- a/connectd/connectd_wiregen.c
+++ b/connectd/connectd_wiregen.c
@@ -443,4 +443,4 @@ bool fromwire_connectd_dev_memleak_reply(const void *p, bool *leak)
  	*leak = fromwire_bool(&cursor, &plen);
 	return cursor != NULL;
 }
-// SHA256STAMP:7c9585941825eab65d734eb1c233eee5c78b5792e19ec68f0a9986abca2b0ffe
+// SHA256STAMP:042c0ae692c223da86af3f09977fdc5f19655e99b928ab05812dd4c1ed95f1c5
diff --git a/connectd/connectd_wiregen.h b/connectd/connectd_wiregen.h
index 46e1ecb00..34ad8ca34 100644
--- a/connectd/connectd_wiregen.h
+++ b/connectd/connectd_wiregen.h
@@ -110,4 +110,4 @@ bool fromwire_connectd_dev_memleak_reply(const void *p, bool *leak);
 
 
 #endif /* LIGHTNING_CONNECTD_CONNECTD_WIREGEN_H */
-// SHA256STAMP:7c9585941825eab65d734eb1c233eee5c78b5792e19ec68f0a9986abca2b0ffe
+// SHA256STAMP:042c0ae692c223da86af3f09977fdc5f19655e99b928ab05812dd4c1ed95f1c5
diff --git a/gossipd/gossip_store_wiregen.c b/gossipd/gossip_store_wiregen.c
index d4c464481..90cbd0b07 100644
--- a/gossipd/gossip_store_wiregen.c
+++ b/gossipd/gossip_store_wiregen.c
@@ -210,4 +210,4 @@ bool fromwire_gossipd_local_add_channel_obs(const tal_t *ctx, const void *p, str
 	fromwire_u8_array(&cursor, &plen, *features, flen);
 	return cursor != NULL;
 }
-// SHA256STAMP:18d52e526a219c3a8bb29c6a29b7bd82880c5befdde88c12424d57cb98a28b17
+// SHA256STAMP:3e6e23b99855a3be9305cbc297d59d818cc193d6ebe5c2ca78dfb6ec5df31e94
diff --git a/gossipd/gossip_store_wiregen.h b/gossipd/gossip_store_wiregen.h
index 2ff5bc91b..0941d51e6 100644
--- a/gossipd/gossip_store_wiregen.h
+++ b/gossipd/gossip_store_wiregen.h
@@ -63,4 +63,4 @@ bool fromwire_gossipd_local_add_channel_obs(const tal_t *ctx, const void *p, str
 
 
 #endif /* LIGHTNING_GOSSIPD_GOSSIP_STORE_WIREGEN_H */
-// SHA256STAMP:18d52e526a219c3a8bb29c6a29b7bd82880c5befdde88c12424d57cb98a28b17
+// SHA256STAMP:3e6e23b99855a3be9305cbc297d59d818cc193d6ebe5c2ca78dfb6ec5df31e94
diff --git a/gossipd/gossipd_peerd_wiregen.c b/gossipd/gossipd_peerd_wiregen.c
index 4a8710da0..a6ff50636 100644
--- a/gossipd/gossipd_peerd_wiregen.c
+++ b/gossipd/gossipd_peerd_wiregen.c
@@ -161,4 +161,4 @@ bool fromwire_gossipd_local_channel_announcement(const tal_t *ctx, const void *p
 	fromwire_u8_array(&cursor, &plen, *cannount, len);
 	return cursor != NULL;
 }
-// SHA256STAMP:2ef99c782b9877add7912c680d3a48bed3372c6a6fe2410716651dbe777493eb
+// SHA256STAMP:e55284452718ed1baf12a38736b4bfeecc8bb18dac8ad4f0ee0b5dc8904fbdc2
diff --git a/gossipd/gossipd_peerd_wiregen.h b/gossipd/gossipd_peerd_wiregen.h
index e20d4a5f3..8240e6616 100644
--- a/gossipd/gossipd_peerd_wiregen.h
+++ b/gossipd/gossipd_peerd_wiregen.h
@@ -57,4 +57,4 @@ bool fromwire_gossipd_local_channel_announcement(const tal_t *ctx, const void *p
 
 
 #endif /* LIGHTNING_GOSSIPD_GOSSIPD_PEERD_WIREGEN_H */
-// SHA256STAMP:2ef99c782b9877add7912c680d3a48bed3372c6a6fe2410716651dbe777493eb
+// SHA256STAMP:e55284452718ed1baf12a38736b4bfeecc8bb18dac8ad4f0ee0b5dc8904fbdc2
diff --git a/gossipd/gossipd_wiregen.c b/gossipd/gossipd_wiregen.c
index c0a3b279e..6e86ca01e 100644
--- a/gossipd/gossipd_wiregen.c
+++ b/gossipd/gossipd_wiregen.c
@@ -1057,4 +1057,4 @@ bool fromwire_gossipd_addgossip_reply(const tal_t *ctx, const void *p, wirestrin
  	*err = fromwire_wirestring(ctx, &cursor, &plen);
 	return cursor != NULL;
 }
-// SHA256STAMP:5fb4bcc3bb8c5f312041142d4bf555a2187c82d82921b819d5a45410efddf6f3
+// SHA256STAMP:a0d7494995d7f95fb7df295bab9d865e18670f15243116a0aaa9b9548534b922
diff --git a/gossipd/gossipd_wiregen.h b/gossipd/gossipd_wiregen.h
index 5bbfca57c..0e989c517 100644
--- a/gossipd/gossipd_wiregen.h
+++ b/gossipd/gossipd_wiregen.h
@@ -225,4 +225,4 @@ bool fromwire_gossipd_addgossip_reply(const tal_t *ctx, const void *p, wirestrin
 
 
 #endif /* LIGHTNING_GOSSIPD_GOSSIPD_WIREGEN_H */
-// SHA256STAMP:5fb4bcc3bb8c5f312041142d4bf555a2187c82d82921b819d5a45410efddf6f3
+// SHA256STAMP:a0d7494995d7f95fb7df295bab9d865e18670f15243116a0aaa9b9548534b922
diff --git a/hsmd/hsmd_wiregen.c b/hsmd/hsmd_wiregen.c
index a664c0472..048a49a28 100644
--- a/hsmd/hsmd_wiregen.c
+++ b/hsmd/hsmd_wiregen.c
@@ -1278,4 +1278,4 @@ bool fromwire_hsmd_sign_bolt12_reply(const void *p, struct bip340sig *sig)
  	fromwire_bip340sig(&cursor, &plen, sig);
 	return cursor != NULL;
 }
-// SHA256STAMP:b419989953cbf50796fc237b5d7e2043f96cb838a1356dbdb27943b341f611a8
+// SHA256STAMP:535c69a065c06a2e2ea151154ae83b53283d1c5b34e18b43a2c12c9444472548
diff --git a/hsmd/hsmd_wiregen.h b/hsmd/hsmd_wiregen.h
index a86a7da16..1da52edbc 100644
--- a/hsmd/hsmd_wiregen.h
+++ b/hsmd/hsmd_wiregen.h
@@ -283,4 +283,4 @@ bool fromwire_hsmd_sign_bolt12_reply(const void *p, struct bip340sig *sig);
 
 
 #endif /* LIGHTNING_HSMD_HSMD_WIREGEN_H */
-// SHA256STAMP:b419989953cbf50796fc237b5d7e2043f96cb838a1356dbdb27943b341f611a8
+// SHA256STAMP:535c69a065c06a2e2ea151154ae83b53283d1c5b34e18b43a2c12c9444472548
diff --git a/onchaind/onchaind_wiregen.c b/onchaind/onchaind_wiregen.c
index 155bffbcd..27797ad01 100644
--- a/onchaind/onchaind_wiregen.c
+++ b/onchaind/onchaind_wiregen.c
@@ -635,4 +635,4 @@ bool fromwire_onchaind_notify_coin_mvt(const void *p, struct chain_coin_mvt *mvt
  	fromwire_chain_coin_mvt(&cursor, &plen, mvt);
 	return cursor != NULL;
 }
-// SHA256STAMP:ef6140d74f021a554c055b0f9b6322334559e6c2059ea51abf1bda2bc90add41
+// SHA256STAMP:6884d8c13750d6bb08de384fe35050309f8f66037662671c2aad2eaa16f47463
diff --git a/onchaind/onchaind_wiregen.h b/onchaind/onchaind_wiregen.h
index e557d6dc3..4d53b35f3 100644
--- a/onchaind/onchaind_wiregen.h
+++ b/onchaind/onchaind_wiregen.h
@@ -161,4 +161,4 @@ bool fromwire_onchaind_notify_coin_mvt(const void *p, struct chain_coin_mvt *mvt
 
 
 #endif /* LIGHTNING_ONCHAIND_ONCHAIND_WIREGEN_H */
-// SHA256STAMP:ef6140d74f021a554c055b0f9b6322334559e6c2059ea51abf1bda2bc90add41
+// SHA256STAMP:6884d8c13750d6bb08de384fe35050309f8f66037662671c2aad2eaa16f47463
diff --git a/openingd/dualopend_wiregen.c b/openingd/dualopend_wiregen.c
index 21ace02e4..21d658ecb 100644
--- a/openingd/dualopend_wiregen.c
+++ b/openingd/dualopend_wiregen.c
@@ -912,4 +912,4 @@ bool fromwire_dualopend_dev_memleak_reply(const void *p, bool *leak)
  	*leak = fromwire_bool(&cursor, &plen);
 	return cursor != NULL;
 }
-// SHA256STAMP:0cbaf66a07e1ffa2e01a85398b6937391af66eb78302e22fe7b9a3076963db4e
+// SHA256STAMP:0a1ed6e8461512630be3bb328083495d5c5f682c59dfb24561024ba8fa0d3b70
diff --git a/openingd/dualopend_wiregen.h b/openingd/dualopend_wiregen.h
index ac4c0597a..de36baf2f 100644
--- a/openingd/dualopend_wiregen.h
+++ b/openingd/dualopend_wiregen.h
@@ -216,4 +216,4 @@ bool fromwire_dualopend_dev_memleak_reply(const void *p, bool *leak);
 
 
 #endif /* LIGHTNING_OPENINGD_DUALOPEND_WIREGEN_H */
-// SHA256STAMP:0cbaf66a07e1ffa2e01a85398b6937391af66eb78302e22fe7b9a3076963db4e
+// SHA256STAMP:0a1ed6e8461512630be3bb328083495d5c5f682c59dfb24561024ba8fa0d3b70
diff --git a/openingd/openingd_wiregen.c b/openingd/openingd_wiregen.c
index 28442fda3..7f615aa09 100644
--- a/openingd/openingd_wiregen.c
+++ b/openingd/openingd_wiregen.c
@@ -569,4 +569,4 @@ bool fromwire_openingd_dev_memleak_reply(const void *p, bool *leak)
  	*leak = fromwire_bool(&cursor, &plen);
 	return cursor != NULL;
 }
-// SHA256STAMP:edd7ee392dff0ddd0dff3a383692ba852a403e64e43290dba5dece69ae438e61
+// SHA256STAMP:d2fcabdf157b098608e47dcdc37db0f46fe8d466d74159969544d7c4bb77f061
diff --git a/openingd/openingd_wiregen.h b/openingd/openingd_wiregen.h
index ba64e5567..047c82110 100644
--- a/openingd/openingd_wiregen.h
+++ b/openingd/openingd_wiregen.h
@@ -121,4 +121,4 @@ bool fromwire_openingd_dev_memleak_reply(const void *p, bool *leak);
 
 
 #endif /* LIGHTNING_OPENINGD_OPENINGD_WIREGEN_H */
-// SHA256STAMP:edd7ee392dff0ddd0dff3a383692ba852a403e64e43290dba5dece69ae438e61
+// SHA256STAMP:d2fcabdf157b098608e47dcdc37db0f46fe8d466d74159969544d7c4bb77f061
diff --git a/tools/gen/impl_template b/tools/gen/impl_template
index 0d1cc6991..8df0bb035 100644
--- a/tools/gen/impl_template
+++ b/tools/gen/impl_template
@@ -244,7 +244,7 @@ static void fromwire_${msg.struct_name()}(const u8 **cursor, size_t *plen, void
         fieldname = 'r->{}->{}'.format(msg.name, f.name)
         ctx = 'r->{}'.format(msg.name)
 %>\
-	${fromwire_subtype_field(fieldname, f, ctx, msg.singleton())}\
+	${fromwire_subtype_field(fieldname, f, ctx, msg.singleton() and not f.type_obj.is_varsize())}\
 	% endfor
 }
     % endfor
diff --git a/tools/test/test_cases b/tools/test/test_cases
index 4854a1dbf..6ff99f53a 100644
--- a/tools/test/test_cases
+++ b/tools/test/test_cases
@@ -148,3 +148,10 @@ tlvdata,test_n3,tlv3,len_varlenvarsize,u8,
 tlvdata,test_n3,tlv3,varlen_varsize,test_features,len_varlenvarsize
 # implicit length
 tlvdata,test_n3,tlv3,remainder,byte,...
+# Singletons which needs a context.
+tlvtype,test_n3,tlv4,4
+tlvdata,test_n3,tlv4,singleton_varlen,subtype_var_len,
+tlvtype,test_n3,tlv5,5
+tlvdata,test_n3,tlv5,singleton_varlen_arr,subtype_var_len,...
+tlvtype,test_n3,tlv6,6
+tlvdata,test_n3,tlv6,singleton_varlen_assign,subtype_var_assign,
diff --git a/wire/bolt12_wiregen.c b/wire/bolt12_wiregen.c
index eadac6be9..9624c2129 100644
--- a/wire/bolt12_wiregen.c
+++ b/wire/bolt12_wiregen.c
@@ -1562,4 +1562,4 @@ bool invoice_error_is_valid(const struct tlv_invoice_error *record, size_t *err_
 	return tlv_fields_valid(record->fields, err_index);
 }
 
-// SHA256STAMP:3c8dc54796300320573ccf24c2ec022c4f95f545576e909e55da001c1d04392d
+// SHA256STAMP:85a22376bfbb4d4b5c1104ae7823b477443ac693db9b2ee53c16b777b74f7d2a
diff --git a/wire/bolt12_wiregen.h b/wire/bolt12_wiregen.h
index 182bf4d98..b8859094a 100644
--- a/wire/bolt12_wiregen.h
+++ b/wire/bolt12_wiregen.h
@@ -316,4 +316,4 @@ struct fallback_address *fromwire_fallback_address(const tal_t *ctx, const u8 **
 
 
 #endif /* LIGHTNING_WIRE_BOLT12_WIREGEN_H */
-// SHA256STAMP:3c8dc54796300320573ccf24c2ec022c4f95f545576e909e55da001c1d04392d
+// SHA256STAMP:85a22376bfbb4d4b5c1104ae7823b477443ac693db9b2ee53c16b777b74f7d2a
diff --git a/wire/common_wiregen.c b/wire/common_wiregen.c
index a855dfd58..1355150fd 100644
--- a/wire/common_wiregen.c
+++ b/wire/common_wiregen.c
@@ -100,4 +100,4 @@ bool fromwire_custommsg_out(const tal_t *ctx, const void *p, u8 **msg)
 	fromwire_u8_array(&cursor, &plen, *msg, msg_len);
 	return cursor != NULL;
 }
-// SHA256STAMP:4498506058a2fd50f9b5adca97e08dce48d1812157ee24829b962eff59e3afa6
+// SHA256STAMP:a747ee0bc8a91c00e719bae883b505d6e7c85b33165a9156a571a0aa171a7256
diff --git a/wire/common_wiregen.h b/wire/common_wiregen.h
index fc33a4afa..9efd995e4 100644
--- a/wire/common_wiregen.h
+++ b/wire/common_wiregen.h
@@ -41,4 +41,4 @@ bool fromwire_custommsg_out(const tal_t *ctx, const void *p, u8 **msg);
 
 
 #endif /* LIGHTNING_WIRE_COMMON_WIREGEN_H */
-// SHA256STAMP:4498506058a2fd50f9b5adca97e08dce48d1812157ee24829b962eff59e3afa6
+// SHA256STAMP:a747ee0bc8a91c00e719bae883b505d6e7c85b33165a9156a571a0aa171a7256
diff --git a/wire/onion_printgen.c b/wire/onion_printgen.c
index 7d6d7d734..8ea922f61 100644
--- a/wire/onion_printgen.c
+++ b/wire/onion_printgen.c
@@ -859,4 +859,4 @@ void printonion_wire_tlv_message(const char *tlv_name, const u8 *msg) {
 		printwire_tlvs(tlv_name, &msg, &plen, print_tlvs_encmsg_tlvs, ARRAY_SIZE(print_tlvs_encmsg_tlvs));
 	}
 }
-// SHA256STAMP:474b138bc0e571b8e5b3a9ce48b263b13b9dc3d516eaada1154e3c3d518d46f9
+// SHA256STAMP:c3ff8c1573066a7cae73a1e5ce1c8c5b5dd7e241129393e600eaf2a4fd6b9f3e
diff --git a/wire/onion_printgen.h b/wire/onion_printgen.h
index fa89d3865..7a7a1ea74 100644
--- a/wire/onion_printgen.h
+++ b/wire/onion_printgen.h
@@ -58,4 +58,4 @@ void printwire_mpp_timeout(const char *fieldname, const u8 *cursor);
 
 void printwire_onionmsg_path(const char *fieldname, const u8 **cursor, size_t *plen);
 #endif /* LIGHTNING_WIRE_ONION_PRINTGEN_H */
-// SHA256STAMP:474b138bc0e571b8e5b3a9ce48b263b13b9dc3d516eaada1154e3c3d518d46f9
+// SHA256STAMP:c3ff8c1573066a7cae73a1e5ce1c8c5b5dd7e241129393e600eaf2a4fd6b9f3e
diff --git a/wire/onion_wiregen.c b/wire/onion_wiregen.c
index 8083c45de..425ad34f7 100644
--- a/wire/onion_wiregen.c
+++ b/wire/onion_wiregen.c
@@ -1026,4 +1026,4 @@ bool fromwire_mpp_timeout(const void *p)
 		return false;
 	return cursor != NULL;
 }
-// SHA256STAMP:474b138bc0e571b8e5b3a9ce48b263b13b9dc3d516eaada1154e3c3d518d46f9
+// SHA256STAMP:c3ff8c1573066a7cae73a1e5ce1c8c5b5dd7e241129393e600eaf2a4fd6b9f3e
diff --git a/wire/onion_wiregen.h b/wire/onion_wiregen.h
index e7b95a7c3..5ca402e6d 100644
--- a/wire/onion_wiregen.h
+++ b/wire/onion_wiregen.h
@@ -317,4 +317,4 @@ bool fromwire_mpp_timeout(const void *p);
 
 
 #endif /* LIGHTNING_WIRE_ONION_WIREGEN_H */
-// SHA256STAMP:474b138bc0e571b8e5b3a9ce48b263b13b9dc3d516eaada1154e3c3d518d46f9
+// SHA256STAMP:c3ff8c1573066a7cae73a1e5ce1c8c5b5dd7e241129393e600eaf2a4fd6b9f3e
diff --git a/wire/peer_printgen.c b/wire/peer_printgen.c
index 42b8111a5..b2ae43f11 100644
--- a/wire/peer_printgen.c
+++ b/wire/peer_printgen.c
@@ -2935,4 +2935,4 @@ void printpeer_wire_tlv_message(const char *tlv_name, const u8 *msg) {
 		printwire_tlvs(tlv_name, &msg, &plen, print_tlvs_onion_message_tlvs, ARRAY_SIZE(print_tlvs_onion_message_tlvs));
 	}
 }
-// SHA256STAMP:aecb66d3600732f50b4279272e4c057d1ea410bddf41cbb01b6326320f5b9de8
+// SHA256STAMP:3ecafff6be37e4049f121dcd6816aada2818fc7c02099372d1358d1b5b9da1ca
diff --git a/wire/peer_printgen.h b/wire/peer_printgen.h
index c482da369..7e494852b 100644
--- a/wire/peer_printgen.h
+++ b/wire/peer_printgen.h
@@ -96,4 +96,4 @@ void printwire_channel_update_checksums(const char *fieldname, const u8 **cursor
 void printwire_channel_update_timestamps(const char *fieldname, const u8 **cursor, size_t *plen);
 void printwire_witness_stack(const char *fieldname, const u8 **cursor, size_t *plen);
 #endif /* LIGHTNING_WIRE_PEER_PRINTGEN_H */
-// SHA256STAMP:aecb66d3600732f50b4279272e4c057d1ea410bddf41cbb01b6326320f5b9de8
+// SHA256STAMP:3ecafff6be37e4049f121dcd6816aada2818fc7c02099372d1358d1b5b9da1ca
diff --git a/wire/peer_wiregen.c b/wire/peer_wiregen.c
index 0f4a630e8..d025048e5 100644
--- a/wire/peer_wiregen.c
+++ b/wire/peer_wiregen.c
@@ -2330,4 +2330,4 @@ bool fromwire_channel_update_option_channel_htlc_max(const void *p, secp256k1_ec
  	*htlc_maximum_msat = fromwire_amount_msat(&cursor, &plen);
 	return cursor != NULL;
 }
-// SHA256STAMP:aecb66d3600732f50b4279272e4c057d1ea410bddf41cbb01b6326320f5b9de8
+// SHA256STAMP:3ecafff6be37e4049f121dcd6816aada2818fc7c02099372d1358d1b5b9da1ca
diff --git a/wire/peer_wiregen.h b/wire/peer_wiregen.h
index f112c1182..f4b5b7722 100644
--- a/wire/peer_wiregen.h
+++ b/wire/peer_wiregen.h
@@ -859,4 +859,4 @@ bool fromwire_channel_update_option_channel_htlc_max(const void *p, secp256k1_ec
 
 
 #endif /* LIGHTNING_WIRE_PEER_WIREGEN_H */
-// SHA256STAMP:aecb66d3600732f50b4279272e4c057d1ea410bddf41cbb01b6326320f5b9de8
+// SHA256STAMP:3ecafff6be37e4049f121dcd6816aada2818fc7c02099372d1358d1b5b9da1ca