Maybe remove the macro at all?