1 files changed, 9 insertions, 23 deletions
diff --git a/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocument2.cs b/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocument2.cs
index 4bcc077c8f4..43fa3d80759 100644
--- a/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocument2.cs
+++ b/mcs/class/System.XML/Mono.Xml.XPath/DTMXPathDocument2.cs
@@ -50,15 +50,14 @@ namespace Mono.Xml.XPath
 			string [] nonAtomicStringPool,
 			Hashtable idTable)
 		{
-			this.Nodes = nodes;
-			this.Attributes = attributes;
-			this.Namespaces = namespaces;
-			this.AtomicStringPool = atomicStringPool;
-			this.NonAtomicStringPool = nonAtomicStringPool;
-			this.IdTable = idTable;
-			this.NameTable = nameTable;
-
-			root = new DTMXPathNavigator2 (this);
+			root = new DTMXPathNavigator2 (this,
+				nameTable,
+				nodes,
+				attributes,
+				namespaces,
+				atomicStringPool,
+				nonAtomicStringPool,
+				idTable);
 		}
 
 		public XPathNavigator CreateNavigator ()
@@ -66,20 +65,7 @@ namespace Mono.Xml.XPath
 			return root.Clone ();
 		}
 
-		readonly XPathNavigator root;
-
-		internal readonly XmlNameTable NameTable;
-
-		internal readonly DTMXPathLinkedNode2 [] Nodes;
-		internal readonly DTMXPathAttributeNode2 [] Attributes;
-		internal readonly DTMXPathNamespaceNode2 [] Namespaces;
-
-		// String pool
-		internal readonly string [] AtomicStringPool;
-		internal readonly string [] NonAtomicStringPool;
-
-		// ID table
-		internal readonly Hashtable IdTable;
+		XPathNavigator root;
 	}
 }