Code review changes

Author: maca88

src/NHibernate/Hql/Ast/ANTLR/Tree/BetweenOperatorNode.cs

@@ -69,21 +69,7 @@ private static void Check(IASTNode check, IASTNode first, IASTNode second)
 				return;
 			}
 
-			IType expectedType = null;
-			if (first is SqlNode firstNode)
-			{
-				expectedType = firstNode.DataType;
-			}
-
-			if (expectedType == null)
-			{
-				if (second is SqlNode secondNode)
-				{
-					expectedType = secondNode.DataType;
-				}
-			}
-
-			expectedTypeAwareNode.ExpectedType = expectedType;
+			expectedTypeAwareNode.ExpectedType = (first as SqlNode)?.DataType ?? (second as SqlNode)?.DataType;
 		}
 	}
 }

src/NHibernate/Linq/Visitors/ExpressionParameterVisitor.cs

@@ -186,10 +186,11 @@ protected override Expression VisitConstant(ConstantExpression expression)
 
 		private NamedParameter CreateParameter(ConstantExpression expression, object value, IType type)
 		{
-			var parameterName = "p" + (_parameters.Count + 1);
-			return _collectionParameters.Contains(expression)
-				? new NamedListParameter(parameterName, value, type)
-				: new NamedParameter(parameterName, value, type);
+			return new NamedParameter(
+				"p" + (_parameters.Count + 1),
+				value,
+				type,
+				_collectionParameters.Contains(expression));
 		}
 
 		private static bool IsNullObject(ConstantExpression expression)

src/NHibernate/Param/NamedListParameter.cs

@@ -5,17 +5,23 @@ namespace NHibernate.Param
 	public class NamedParameter
 	{
 		public NamedParameter(string name, object value, IType type)
+			: this(name, value, type, false)
+		{
+		}
+
+		internal NamedParameter(string name, object value, IType type, bool isCollection)
 		{
 			Name = name;
 			Value = value;
 			Type = type;
+			IsCollection = isCollection;
 		}
 
 		public string Name { get; private set; }
 		public object Value { get; internal set; }
 		public IType Type { get; internal set; }
 
-		public virtual bool IsCollection => false;
+		public virtual bool IsCollection { get; }
 
 		public bool Equals(NamedParameter other)
 		{