Fixing up proper macro usages for non-comma calls.