BooleanOp and BitwiseOp changed