Cleanup substitute macro implementation.