Reordered context for macro usage