Move some macros back to __op__ to work around bug in erl_eval