diff --git a/upb/wire/decode_fast/combinations.h b/upb/wire/decode_fast/combinations.h
index 08df3a39dffa2..89633249d6ee2 100644
--- a/upb/wire/decode_fast/combinations.h
+++ b/upb/wire/decode_fast/combinations.h
@@ -50,15 +50,15 @@
 #define ENUM_VAL(_, x) kUpb_DecodeFast_##x,
 
 typedef enum {
-  UPB_DECODEFAST_CARDINALITIES(ENUM_VAL)  // kUpb_DecodeFast_Scalar = 0, etc.
+  UPB_DECODEFAST_CARDINALITIES(ENUM_VAL, _)  // kUpb_DecodeFast_Scalar = 0, etc.
 } upb_DecodeFast_Cardinality;
 
 typedef enum {
-  UPB_DECODEFAST_TYPES(ENUM_VAL)  // kUpb_DecodeFast_Bool = 0, etc.
+  UPB_DECODEFAST_TYPES(ENUM_VAL, _)  // kUpb_DecodeFast_Bool = 0, etc.
 } upb_DecodeFast_Type;
 
 typedef enum {
-  UPB_DECODEFAST_TAGSIZES(ENUM_VAL)  // kUpb_DecodeFast_Tag1Byte = 0, etc.
+  UPB_DECODEFAST_TAGSIZES(ENUM_VAL, _)  // kUpb_DecodeFast_Tag1Byte = 0, etc.
 } upb_DecodeFast_TagSize;
 
 #undef ENUM_VAL
@@ -67,9 +67,9 @@ typedef enum {
 
 enum {
   // Counts of the number of enum values for each dimension.
-  kUpb_DecodeFast_CardinalityCount = UPB_DECODEFAST_CARDINALITIES(ADD),
-  kUpb_DecodeFast_TypeCount = UPB_DECODEFAST_TYPES(ADD),
-  kUpb_DecodeFast_TagSizeCount = UPB_DECODEFAST_TAGSIZES(ADD),
+  kUpb_DecodeFast_CardinalityCount = UPB_DECODEFAST_CARDINALITIES(ADD, _),
+  kUpb_DecodeFast_TypeCount = UPB_DECODEFAST_TYPES(ADD, _),
+  kUpb_DecodeFast_TagSizeCount = UPB_DECODEFAST_TAGSIZES(ADD, _),
 };
 
 #undef ADD
diff --git a/upb/wire/decode_fast/field_parsers.h b/upb/wire/decode_fast/field_parsers.h
index 2f2b25aeecc7e..d128c3f235753 100644
--- a/upb/wire/decode_fast/field_parsers.h
+++ b/upb/wire/decode_fast/field_parsers.h
@@ -38,7 +38,7 @@ struct upb_FastDecoder_Return;
   UPB_PRESERVE_NONE struct upb_FastDecoder_Return UPB_DECODEFAST_FUNCNAME( \
       type, card, size)(PARSE_PARAMS);
 
-UPB_DECODEFAST_FUNCTIONS(F);
+UPB_DECODEFAST_FUNCTIONS(F)
 
 UPB_PRESERVE_NONE
 struct upb_FastDecoder_Return _upb_FastDecoder_DecodeGeneric(PARSE_PARAMS);