Macro elimination - easy cases first. No logic changes.