Small corrections

Author: maca88

src/NHibernate.Test/Linq/TryGetMappedTests.cs

@@ -23,8 +23,8 @@ namespace NHibernate.Test.Linq
 	/// </summary>
 	public class TryGetMappedTests : LinqTestCase
 	{
-		private readonly static TryGetMappedType _tryGetMappedType;
-		private readonly static TryGetMappedNullability _tryGetMappedNullability;
+		private static readonly TryGetMappedType _tryGetMappedType;
+		private static readonly TryGetMappedNullability _tryGetMappedNullability;
 
 		delegate bool TryGetMappedType(
 			ISessionFactoryImplementor sessionFactory,

src/NHibernate/Util/ExpressionsHelper.cs

@@ -165,10 +165,8 @@ internal static bool TryGetMappedType(
 					component = null;
 					return false;
 				}
-				else
-				{
-					currentEntityPersister = convertPersister; // ((Subclass)q).Id
-				}
+
+				currentEntityPersister = convertPersister; // ((Subclass)q).Id
 			}
 
 			return TraverseMembers(
@@ -222,16 +220,13 @@ private static bool TraverseMembers(
 						}
 						else
 						{
-							if (!currentType.IsAnyType)
-							{
-								// Concatenate the component property path in order to be able to use EntityMetamodel.GetPropertyType to retrieve the type.
-								// As GetPropertyType supports only components, do not concatenate when dealing with collection composite elements or elements.
-								// q.Component.Prop
-								member = new MemberMetadata(
-									$"{memberPath}.{member.Path}",
-									member.ConvertType,
-									member.HasIndexer);
-							}
+							// Concatenate the component property path in order to be able to use EntityMetamodel.GetPropertyType to retrieve the type.
+							// As GetPropertyType supports only components, do not concatenate when dealing with collection composite elements or elements.
+							// q.Component.Prop
+							member = new MemberMetadata(
+								$"{memberPath}.{member.Path}",
+								member.ConvertType,
+								member.HasIndexer);
 
 							// q.Component.Prop
 							currentType = currentEntityPersister.EntityMetamodel.GetPropertyType(member.Path);
@@ -475,7 +470,7 @@ private class MemberMetadataExtractor : NhExpressionVisitor
 			/// <summary>
 			/// Traverses the expression from top to bottom until the first <see cref="ConstantExpression"/> containing an IEntityNameProvider instance is found.
 			/// </summary>
-			/// <param name="expression">The expression to travese.</param>
+			/// <param name="expression">The expression to traverse.</param>
 			/// <param name="entityName">An output parameter that will be populated by the first <see cref="IEntityNameProvider.EntityName"/> that is found or null otherwise.</param>
 			/// <param name="convertType">An output parameter that will be populated only when <see cref="ConstantExpression"/> containing an IEntityNameProvider 
 			/// is followed by an <see cref="UnaryExpression"/>.</param>