BinaryOpLiteral refactored