Use a more robust way to do compile-time concats

Use a more robust way to do compile-time concats #3617