fixup! GH-1879 - Allow Coalesce and Conditional logic on entity properties and collections (LINQ)

Do additional minor cleanup

Author: fredericDelaporte

src/NHibernate/Linq/ReWriters/ConditionalQueryReferenceExpander.cs

@@ -76,7 +76,7 @@ public void Transform(ResultOperatorBase resultOperator)
 
 			protected override Expression VisitMember(MemberExpression node)
 			{
-				var result = (MemberExpression)base.VisitMember(node);
+				var result = (MemberExpression) base.VisitMember(node);
 				if (QueryReferenceCounter.CountReferences(result.Expression) > 1)
 				{
 					return ConditionalQueryReferenceMemberExpressionRewriter.Rewrite(result.Expression, node);
@@ -89,7 +89,7 @@ protected override Expression VisitMethodCall(MethodCallExpression node)
 				var result = (MethodCallExpression)base.VisitMethodCall(node);
 				var isExtension = node.Method.GetCustomAttributes<ExtensionAttribute>().Any();
 				var methodObject = isExtension ? node.Arguments[0] : node.Object;
-				
+
 				if (methodObject != null && QueryReferenceCounter.CountReferences(methodObject) > 1)
 				{
 					return ConditionalQueryReferenceMethodCallExpressionRewriter.Rewrite(methodObject, node);
@@ -107,7 +107,7 @@ private QueryReferenceCounter(System.Type queryType)
 			{
 				_queryType = queryType;
 			}
-			
+
 			protected override Expression VisitQuerySourceReference(QuerySourceReferenceExpression expression)
 			{
 				if (_queryType.IsAssignableFrom(expression.Type))

src/NHibernate/Linq/ReWriters/SubQueryConditionalExpander.cs

@@ -94,16 +94,16 @@ protected override Expression VisitConditional(ConditionalExpression node)
 					_nominate[_depth] = false;
 				}
 
-				var newTest = this.Visit(node.Test);
+				var newTest = Visit(node.Test);
 				_nominate.Insert(++_depth, false);
-				var newTrue = this.Visit(node.IfTrue);
+				var newTrue = Visit(node.IfTrue);
 				if (_nominate[_depth])
 				{
 					newTrue = BuildNewSubQuery(newTrue);
 					Rewritten = true;
 				}
 				_nominate.Insert(_depth, false);
-				var newFalse = this.Visit(node.IfFalse);
+				var newFalse = Visit(node.IfFalse);
 				if (_nominate[_depth])
 				{
 					newFalse = BuildNewSubQuery(newFalse);