Support __VA_OPT__

Fixes #1574
5 files changed