XRENDERING-297: Preserve parameters order in macros