Make makeMacro a little more fancy