Added -me and -ma flags for new macro packages; rearranged