This is a neat hack, and very well written. I felt a bit of nostalgia looking at the (classical) cpp flex to avoid repeating an identifier

   #define X(s) #s
   #define S(s) X(s)