Stop using old format macros