Get legacy macros working with system framework modules