diff --git a/lightning/src/ln/peer_handler.rs b/lightning/src/ln/peer_handler.rs
index 37166acb461..03ebc481409 100644
--- a/lightning/src/ln/peer_handler.rs
+++ b/lightning/src/ln/peer_handler.rs
@@ -67,7 +67,7 @@ macro_rules! composite_custom_message_handler {
 		}
 
 		$message_visibility:vis enum $message:ident {
-			$($variant:ident($range:pat)),* $(,)*
+			$($variant:ident($($pattern:pat)|+)),* $(,)*
 		}
 	) => {
 		#[allow(missing_docs)]
@@ -92,10 +92,12 @@ macro_rules! composite_custom_message_handler {
 			) -> Result<Option<Self::CustomMessage>, msgs::DecodeError> {
 				match message_type {
 					$(
-						$range => match <$type>::read(&self.$field, message_type, buffer)? {
-							None => unreachable!(),
-							Some(message) => Ok(Some($message::$variant(message))),
-						},
+						$(
+							$pattern => match <$type>::read(&self.$field, message_type, buffer)? {
+								None => unreachable!(),
+								Some(message) => Ok(Some($message::$variant(message))),
+							},
+						)*
 					)*
 					_ => Ok(None),
 				}
@@ -131,8 +133,8 @@ composite_custom_message_handler!(
 	}
 
 	pub enum CompositeMessage {
-		Infallible(0),
-		Infallible2(1..=10),
+		Infallible(0 | 2 | 4),
+		Infallible2(1..=10 | 99),
 	}
 );