__VA_OPT__
This seems to do the right thing, and my test case (copied from the C spec) passes finally.