Merge pull request #11008 from Pokechu22/va_opt Use `__VA_OPT__(, ) __VA_ARGS__` instead of `##__VA_ARGS__`
