SI-5940 enables default and named args in macros