refactor to remove "with context" when importing macros