Avoid casting when propertyName is provided; Restored switch

Author: bahusoid

src/NHibernate/Criterion/CriterionUtil.cs

@@ -168,12 +168,8 @@ public static TypedValue GetTypedValue(
 			string propertyName,
 			object value)
 		{
-			var propertyProjection = projection as IPropertyProjection;
-			if (projection == null || propertyProjection != null)
-			{
-				var pn = propertyProjection != null ? propertyProjection.PropertyName : propertyName;
-				return criteriaQuery.GetTypedValue(criteria, pn, value);
-			}
+			if (propertyName != null || (propertyName = (projection as IPropertyProjection)?.PropertyName) != null)
+				return criteriaQuery.GetTypedValue(criteria, propertyName, value);
 
 			return new TypedValue(NHibernateUtil.GuessType(value), value);
 		}

src/NHibernate/Criterion/PropertyExpression.cs

@@ -75,10 +75,13 @@ public override SqlString ToSqlString(ICriteria criteria, ICriteriaQuery criteri
 			var otherColumnNames =
 				CriterionUtil.GetColumnNamesAsSqlStringParts(_rhsPropertyName, _rhsProjection, criteriaQuery, criteria);
 
-			if (columnNames.Length == 0)
-				return SqlString.Empty;
-			if (columnNames.Length == 1)
-				return new SqlString(columnNames[0], Op, otherColumnNames[0]);
+			switch (columnNames.Length)
+			{
+				case 1:
+					return new SqlString(columnNames[0], Op, otherColumnNames[0]);
+				case 0:
+					return SqlString.Empty;
+			}
 
 			var sb = new SqlStringBuilder();
 			sb.Add(StringHelper.OpenParen);