Refactored remaining calls to invoke macro