Added macro heuristics (not hooked in yet)