Fix the ## handling to work with old gcc versions (spaces around the ','
to make token boundaries work).