--- a/dmd/TypeInfoStructDeclaration.d	Thu Sep 09 22:51:44 2010 +0100
+++ b/dmd/TypeInfoStructDeclaration.d	Fri Sep 10 00:27:37 2010 +0100
@@ -100,31 +100,30 @@
 		{	
 			// bool opEqual(const T*) const;
 			scope Scope sc = new Scope();
-			auto arguments = new Arguments;
+			auto arguments = new Parameters;
 		version (STRUCTTHISREF) {
 			// arg type is ref const T
-			auto arg = new Argument(STC.STCref, tc.constOf(), null, null);
+			auto arg = new Parameter(STC.STCref, tc.constOf(), null, null);
 		} else {
 			// arg type is const T*
-			auto arg = new Argument(STC.STCin, tc.pointerTo(), null, null);
+			auto arg = new Parameter(STC.STCin, tc.pointerTo(), null, null);
 		}
 
 	        arguments.push(arg);
 	        tfeqptr = new TypeFunction(arguments, Type.tbool, 0, LINK.LINKd);
 	        tfeqptr.mod = MODconst;
-	        tfeqptr = cast(TypeFunction)tfeqptr.semantic(0, &sc);
+	        tfeqptr = cast(TypeFunction)tfeqptr.semantic(Loc(0), sc);
         }
 
-        TypeFunction *tfcmpptr;
         {
 	        Scope sc;
-	        auto arguments = new Arguments;
+	        auto arguments = new Parameters;
 version(STRUCTTHISREF) {
 	        // arg type is ref const T
-	        auto arg = new Argument(STC.STCref, tc.constOf(), null, null);
+	        auto arg = new Parameter(STC.STCref, tc.constOf(), null, null);
 } else {
 	    // arg type is const T*
-	        auto arg = new Argument(STC.STCin, tc.pointerTo(), null, null);
+	        auto arg = new Parameter(STC.STCin, tc.pointerTo(), null, null);
 }
 
 			arguments.push(arg);
@@ -133,7 +132,7 @@
 			tfeqptr = cast(TypeFunction)tfeqptr.semantic(Loc(0), sc);
 		}
 
-		TypeFunction tfcmpptr;
+        TypeFunction tfcmpptr;
 		{
 			scope Scope sc = new Scope();
 			auto arguments = new Parameters;