PJ: remove trailing comma after final argument in some macros.