More code optimization with the new argument macros #6253