Revert "SI-5920 enables default and named args in macros"

This reverts commit a02e053a5dec134f7c7dc53a2c1091039218237d.

Review by @xeno-by