diff --git a/data/skeletons/bison.m4 b/data/skeletons/bison.m4
index 5c7af1e1..829bee54 100644
--- a/data/skeletons/bison.m4
+++ b/data/skeletons/bison.m4
@@ -532,9 +532,9 @@ m4_define([b4_any_token_visible_if],
 # ----------------------------
 m4_define([b4_token_format],
 [b4_token_visible_if([$2],
-[m4_quote(m4_format([$1],
-                     [b4_symbol([$2], [id])],
-                     [b4_symbol([$2], b4_api_token_raw_if([[number]], [[user_number]]))]))])])
+[m4_format([[$1]],
+           m4_quote(b4_symbol([$2], [id])),
+           m4_quote(b4_symbol([$2], b4_api_token_raw_if([[number]], [[user_number]]))))])])
 
 
 ## ------- ##