Update to C#6 Syntax. To be squashed.

Author: hazzik

src/NHibernate/Collection/Generic/PersistentGenericBag.cs

@@ -49,8 +49,6 @@ public class PersistentGenericBag<T> : AbstractPersistentCollection, IList<T>, I
 		 */
 		private IList<T> _gbag;
 
-		private IQueryable<T> queryable;
-
 		public PersistentGenericBag()
 		{
 		}
@@ -167,26 +165,6 @@ public bool IsReadOnly
 			get { return false; }
 		}
 
-		public Expression Expression
-		{
-			get { return InnerQueryable.Expression; }
-		}
-
-		public System.Type ElementType
-		{
-			get { return InnerQueryable.ElementType; }
-		}
-
-		public IQueryProvider Provider
-		{
-			get { return InnerQueryable.Provider; }
-		}
-
-		private IQueryable<T> InnerQueryable
-		{
-			get { return queryable ?? (queryable = new NhQueryable<T>(Session, this)); }
-		}
-
 		public void Add(T item)
 		{
 			if (!IsOperationQueueEnabled)
@@ -529,6 +507,20 @@ public override string ToString()
 			return StringHelper.CollectionToString(_gbag);
 		}
 
+		#region IQueryable<T> Members
+
+		IQueryable<T> _queryable;
+
+		Expression IQueryable.Expression => InnerQueryable.Expression;
+
+		System.Type IQueryable.ElementType => InnerQueryable.ElementType;
+
+		IQueryProvider IQueryable.Provider => InnerQueryable.Provider;
+
+		IQueryable<T> InnerQueryable => _queryable ?? (_queryable = new NhQueryable<T>(Session, this));
+
+		#endregion
+
 		/// <summary>
 		/// Counts the number of times that the <paramref name="element"/> occurs
 		/// in the <paramref name="list"/>.

src/NHibernate/Collection/Generic/PersistentGenericList.cs

@@ -509,7 +509,7 @@ IEnumerator<T> IEnumerable<T>.GetEnumerator()
 		}
 
 		#endregion
-		
+
 		#region IQueryable<T> Members
 
 		IQueryable<T> _queryable;

src/NHibernate/Collection/Generic/PersistentGenericSet.cs

@@ -40,8 +40,6 @@ public class PersistentGenericSet<T> : AbstractPersistentCollection, ISet<T>, IQ
 		[NonSerialized]
 		private IList<T> _tempList;
 
-		private IQueryable<T> queryable;
-
 		// needed for serialization
 		public PersistentGenericSet()
 		{
@@ -496,27 +494,6 @@ public bool IsSynchronized
 			get { return false; }
 		}
 
-		public Expression Expression
-		{
-			get { return InnerQueryable.Expression; }
-		}
-
-		public System.Type ElementType
-		{
-			get { return InnerQueryable.ElementType; }
-		}
-
-		public IQueryProvider Provider
-		{
-			get { return InnerQueryable.Provider; }
-		}
-
-		private IQueryable<T> InnerQueryable
-		{
-			get { return queryable ?? (queryable = new NhQueryable<T>(Session, this)); }
-		}
-
-
 		void ICollection<T>.Add(T item)
 		{
 			Add(item);
@@ -544,6 +521,19 @@ public IEnumerator<T> GetEnumerator()
 
 		#endregion
 
+		#region IQueryable<T> Members
+
+		IQueryable<T> _queryable;
+
+		Expression IQueryable.Expression => InnerQueryable.Expression;
+
+		System.Type IQueryable.ElementType => InnerQueryable.ElementType;
+
+		IQueryProvider IQueryable.Provider => InnerQueryable.Provider;
+
+		IQueryable<T> InnerQueryable => _queryable ?? (_queryable = new NhQueryable<T>(Session, this));
+
+		#endregion
 
 		#region DelayedOperations