Clean up macro overrides for operators.

#205