NumExpression change and BinaryExpression modularzation.