Removing EXEC from macros (2)