diff --git a/data/skeletons/bison.m4 b/data/skeletons/bison.m4
index 519d04f7..8a33a582 100644
--- a/data/skeletons/bison.m4
+++ b/data/skeletons/bison.m4
@@ -480,7 +480,9 @@ m4_popdef([b4_actions_])dnl
 
 # _b4_symbol_case(SYMBOL-NUM)
 # ---------------------------
-# Issue a "case NUM" for SYMBOL-NUM.
+# Issue a "case NUM" for SYMBOL-NUM.  Ends with its EOL to make it
+# easier to use with m4_map, but then, use []dnl to suppress the last
+# one.
 m4_define([_b4_symbol_case],
 [case b4_symbol([$1], [number]): b4_symbol_tag_comment([$1])])
 ])
diff --git a/data/skeletons/lalr1.cc b/data/skeletons/lalr1.cc
index f248d6d2..09f4259f 100644
--- a/data/skeletons/lalr1.cc
+++ b/data/skeletons/lalr1.cc
@@ -110,7 +110,7 @@ b4_dollar_pushdef([yysym.value],
                   [$1],
                   [],
                   [yysym.location])dnl
-      _b4_symbol_case([$1])
+      _b4_symbol_case([$1])[]dnl
 b4_syncline([b4_symbol([$1], [$2_line])], [b4_symbol([$1], [$2_file])])
         b4_symbol([$1], [$2])
 b4_syncline([@oline@], [@ofile@])