Fix op & binary and unary confusion