Fixes a compilation issues

A few variadic macros were fixed so trailing commas are removed when no
extra argument were provided