Some cleanup do to the new restrictions for macros