Add support for macros in composite-commands