Use the cpp `##` concatenation operator in the macros instead of `/**/`

Some newer cpps introduce a space with the latter operator, which breaks
the build.  The concatention operator should be used to combine tokens
together, and guarantees that there won't be any whitespace introduced.