BinaryOperatorDictionary changed to BinaryOperator