diff --git a/common/Makefile b/common/Makefile
index dfc7ab9ccbc9..c5cc878936ee 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -45,6 +45,7 @@ COMMON_SRC_NOGEN :=				\
 	common/initial_channel.c		\
 	common/initial_commit_tx.c		\
 	common/io_lock.c			\
+	common/iso4217.c			\
 	common/json.c				\
 	common/json_helpers.c			\
 	common/json_stream.c			\
@@ -100,7 +101,6 @@ COMMON_HEADERS_NOGEN := $(COMMON_SRC_NOGEN:.c=.h)	\
 	common/errcode.h				\
 	common/gossip_constants.h			\
 	common/htlc.h					\
-	common/iso4217.h				\
 	common/json_command.h				\
 	common/jsonrpc_errors.h				\
 	common/overflows.h				\
diff --git a/wire/Makefile b/wire/Makefile
index a38988de8326..c0e10636d69c 100644
--- a/wire/Makefile
+++ b/wire/Makefile
@@ -79,13 +79,13 @@ wire/bolt12_wire.csv.raw: bolt-precheck
 	@$(BOLT_EXTRACT) $(LOCAL_BOLTDIR)/12*.md > $@
 
 # How to make the exp versions from non-exp versions:
-wire/peer_exp_wire.csv: wire/peer_wire.csv
+wire/peer_exp_wire.csv: wire/peer_wire.csv $(PEER_EXP_PATCHES)
 	@set -e; T=$@; trap "rm -f $$T.$$$$" 0; cp $< $$T.$$$$; for p in $(PEER_EXP_PATCHES); do echo APPLY $$p; patch $$T.$$$$ $$p; done; mv $$T.$$$$ $$T
 
-wire/onion_exp_wire.csv: wire/onion_wire.csv
+wire/onion_exp_wire.csv: wire/onion_wire.csv $(ONION_EXP_PATCHES)
 	@set -e; T=$@; trap "rm -f $$T.$$$$" 0; cp $< $$T.$$$$; for p in $(ONION_EXP_PATCHES); do echo APPLY $$p; patch $$T.$$$$ $$p; done; mv $$T.$$$$ $$T
 
-wire/bolt12_exp_wire.csv: wire/bolt12_wire.csv
+wire/bolt12_exp_wire.csv: wire/bolt12_wire.csv $(BOLT12_EXP_PATCHES)
 	@set -e; T=$@; trap "rm -f $$T.$$$$" 0; cp $< $$T.$$$$; for p in $(BOLT12_EXP_PATCHES); do echo APPLY $$p; patch $$T.$$$$ $$p; done; mv $$T.$$$$ $$T
 
 # These can be deleted.
diff --git a/wire/bolt12_wiregen.c b/wire/bolt12_wiregen.c
index b52cf3326301..c3258a59952b 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:b09ebf868d0b5b9792d0054bee17d763c1243d18c419847c554c63aefb7a8548
+// SHA256STAMP:e82f2f1c0f73838262e59ffeb3572d5e8ce6efcca7c8ae3c36f6448adacde16b
diff --git a/wire/bolt12_wiregen.h b/wire/bolt12_wiregen.h
index 91d79a34909c..909fe9af68ab 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:b09ebf868d0b5b9792d0054bee17d763c1243d18c419847c554c63aefb7a8548
+// SHA256STAMP:e82f2f1c0f73838262e59ffeb3572d5e8ce6efcca7c8ae3c36f6448adacde16b
diff --git a/wire/common_wiregen.c b/wire/common_wiregen.c
index 25f7fc46a0d0..3155673848d6 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:304c3015d0df2a9436adf3c2c96365d438781a5cf55b9ccba73a05dd7bc28a4d
+// SHA256STAMP:65c5b5accba767d72ee72ac8915a4fcf0524ef688d3bdfaa1e4a548ba041b354
diff --git a/wire/common_wiregen.h b/wire/common_wiregen.h
index faa8de6091e1..9ec1fe6deb75 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:304c3015d0df2a9436adf3c2c96365d438781a5cf55b9ccba73a05dd7bc28a4d
+// SHA256STAMP:65c5b5accba767d72ee72ac8915a4fcf0524ef688d3bdfaa1e4a548ba041b354
diff --git a/wire/onion_printgen.c b/wire/onion_printgen.c
index 921c529c7512..203ba5fe12ef 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:897accc52196e69cffeee8386a5e1af8754fe49baefd58460c788024e4e8dd6f
+// SHA256STAMP:a6e1f0cd5e6b270cf9269569f56b283241f4b5c7f393ef86423399b51f1f6b98
diff --git a/wire/onion_printgen.h b/wire/onion_printgen.h
index 21dbd534bcf1..51618d4ee97a 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:897accc52196e69cffeee8386a5e1af8754fe49baefd58460c788024e4e8dd6f
+// SHA256STAMP:a6e1f0cd5e6b270cf9269569f56b283241f4b5c7f393ef86423399b51f1f6b98
diff --git a/wire/onion_wiregen.c b/wire/onion_wiregen.c
index fdf848c4f94e..513cf81436b5 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:897accc52196e69cffeee8386a5e1af8754fe49baefd58460c788024e4e8dd6f
+// SHA256STAMP:a6e1f0cd5e6b270cf9269569f56b283241f4b5c7f393ef86423399b51f1f6b98
diff --git a/wire/onion_wiregen.h b/wire/onion_wiregen.h
index 71e78b33ca10..01f011da45e8 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:897accc52196e69cffeee8386a5e1af8754fe49baefd58460c788024e4e8dd6f
+// SHA256STAMP:a6e1f0cd5e6b270cf9269569f56b283241f4b5c7f393ef86423399b51f1f6b98
diff --git a/wire/peer_printgen.c b/wire/peer_printgen.c
index 83f0869ccec6..166fd4793ced 100644
--- a/wire/peer_printgen.c
+++ b/wire/peer_printgen.c
@@ -2130,4 +2130,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:b3a92a714208711191936bbdb7ff0f0a2ca412941ea95e67210029e5249f3d60
+// SHA256STAMP:1b0c5319cd9ab8c0281132a4c64ca51ecd9ee0158c7f645e102f401ac64ca439
diff --git a/wire/peer_printgen.h b/wire/peer_printgen.h
index 7767289a6094..cc597757ac7c 100644
--- a/wire/peer_printgen.h
+++ b/wire/peer_printgen.h
@@ -74,4 +74,4 @@ void printwire_onion_message(const char *fieldname, const u8 *cursor);
 void printwire_channel_update_checksums(const char *fieldname, const u8 **cursor, size_t *plen);
 void printwire_channel_update_timestamps(const char *fieldname, const u8 **cursor, size_t *plen);
 #endif /* LIGHTNING_WIRE_PEER_PRINTGEN_H */
-// SHA256STAMP:b3a92a714208711191936bbdb7ff0f0a2ca412941ea95e67210029e5249f3d60
+// SHA256STAMP:1b0c5319cd9ab8c0281132a4c64ca51ecd9ee0158c7f645e102f401ac64ca439
diff --git a/wire/peer_wiregen.c b/wire/peer_wiregen.c
index 464e74629f5d..8a6700b7cf22 100644
--- a/wire/peer_wiregen.c
+++ b/wire/peer_wiregen.c
@@ -1749,4 +1749,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:b3a92a714208711191936bbdb7ff0f0a2ca412941ea95e67210029e5249f3d60
+// SHA256STAMP:1b0c5319cd9ab8c0281132a4c64ca51ecd9ee0158c7f645e102f401ac64ca439
diff --git a/wire/peer_wiregen.h b/wire/peer_wiregen.h
index 3d08bd645f19..b3c9477b5c47 100644
--- a/wire/peer_wiregen.h
+++ b/wire/peer_wiregen.h
@@ -650,4 +650,4 @@ bool fromwire_channel_update_option_channel_htlc_max(const void *p, secp256k1_ec
 
 
 #endif /* LIGHTNING_WIRE_PEER_WIREGEN_H */
-// SHA256STAMP:b3a92a714208711191936bbdb7ff0f0a2ca412941ea95e67210029e5249f3d60
+// SHA256STAMP:1b0c5319cd9ab8c0281132a4c64ca51ecd9ee0158c7f645e102f401ac64ca439