updated code to be more resilient to constant location.

Author: craiggwilson

src/MongoDB.Driver/Linq/Processors/Normalizer.cs

@@ -163,9 +163,7 @@ private BinaryExpression EnsureConstantIsOnRight(BinaryExpression node)
             var left = node.Left;
             var right = node.Right;
             var operatorType = node.NodeType;
-            if (left.NodeType == ExpressionType.Constant ||
-                (left.NodeType == ExpressionType.Convert && ((UnaryExpression)left).Operand.NodeType == ExpressionType.Constant) ||
-                (left.NodeType == ExpressionType.ConvertChecked && ((UnaryExpression)left).Operand.NodeType == ExpressionType.Constant))
+            if (RemoveUnnecessaries(left).NodeType == ExpressionType.Constant)
             {
                 right = node.Left;
                 left = node.Right;
@@ -209,5 +207,17 @@ private Expression VisitVBCompilerServicesOperatorsCompareString(MethodCallExpre
 
             return null;
         }
+
+        private Expression RemoveUnnecessaries(Expression node)
+        {
+            while (node.NodeType == ExpressionType.Convert ||
+                node.NodeType == ExpressionType.ConvertChecked ||
+                node.NodeType == ExpressionType.Quote)
+            {
+                node = ((UnaryExpression)node).Operand;
+            }
+
+            return node;
+        }
     }
 }