Switch from typedef'd enum binary ops to #define'd ones.