Change to only use the new macrodef