Update scripts with new definition of macrodef