Clean up macro overrides for operators.
Merge pull request #206 from natefaubion/op-enforest

Clean up macro overrides for operators.