X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=mcs%2Ftests%2Fver-il-net_4_5.xml;h=11ec207c5edcd5ac7a91e67205807fc7a29ebd02;hb=c39718bbb394fe97281e6e64945b4572bef29121;hp=f98a0475acfa160a77036fbdfd681b2b3c6b7cf8;hpb=17183a6fbf75a5ca960d7541676aea7fd7b09d21;p=mono.git

diff --git a/mcs/tests/ver-il-net_4_5.xml b/mcs/tests/ver-il-net_4_5.xml
index f98a0475acf..11ec207c5ed 100644
--- a/mcs/tests/ver-il-net_4_5.xml
+++ b/mcs/tests/ver-il-net_4_5.xml
@@ -29,12 +29,6 @@
       <method name="System.Object Invoke(System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="System.Object EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -47,6 +41,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Del">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.Object EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="dtest-002.cs">
     <type name="C">
@@ -1033,7 +1035,7 @@
         <size>1367</size>
       </method>
       <method name="Void LeftShiftNullableTest()" attrs="129">
-        <size>1138</size>
+        <size>1363</size>
       </method>
       <method name="Void LeftShiftAssignTest()" attrs="129">
         <size>650</size>
@@ -1135,7 +1137,7 @@
         <size>1153</size>
       </method>
       <method name="Void RightShiftNullableTest()" attrs="129">
-        <size>1137</size>
+        <size>1362</size>
       </method>
       <method name="Void RightShiftAssignTest()" attrs="129">
         <size>650</size>
@@ -1202,12 +1204,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -1244,9 +1240,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -1372,16 +1365,23 @@
         <size>220</size>
       </method>
     </type>
-  </test>
-  <test name="dtest-007.cs">
-    <type name="D">
-      <method name="Void Invoke()" attrs="454">
+    <type name="Tester+EmptyDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Tester+&lt;ConvertImplicitReturnTest_2&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+  </test>
+  <test name="dtest-007.cs">
+    <type name="D">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -1389,15 +1389,6 @@
       </method>
     </type>
     <type name="D2">
-      <method name="Void Invoke(Decimal)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="IAsyncResult BeginInvoke(Decimal, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -1433,9 +1424,6 @@
       <method name="Void GenericVoid[T](T)" attrs="150">
         <size>2</size>
       </method>
-      <method name="Int32 StaticMethod(System.Int32[])" attrs="150">
-        <size>16</size>
-      </method>
       <method name="Void ArglistMethod(...)" attrs="150">
         <size>2</size>
       </method>
@@ -1566,9 +1554,6 @@
       <method name="Void &lt;InvokeMember_Error&gt;m__1()" attrs="145">
         <size>112</size>
       </method>
-      <method name="Void &lt;InvokeConstructor&gt;m__2(Decimal)" attrs="145">
-        <size>2</size>
-      </method>
       <method name="Int32 &lt;IsEvent&gt;m__3()" attrs="145">
         <size>9</size>
       </method>
@@ -1600,6 +1585,35 @@
         <size>102</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="D2">
+      <method name="Void Invoke(System.Decimal)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.IAsyncResult BeginInvoke(System.Decimal, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="Class">
+      <method name="Int32 StaticMethod(Int32[])" attrs="150">
+        <size>16</size>
+      </method>
+    </type>
+    <type name="Tester">
+      <method name="Void &lt;InvokeConstructor&gt;m__2(System.Decimal)" attrs="145">
+        <size>2</size>
+      </method>
+    </type>
   </test>
   <test name="dtest-008.cs">
     <type name="Disposable">
@@ -1745,15 +1759,15 @@
       <method name="Boolean op_Inequality(C, System.Object)" attrs="2198">
         <size>260</size>
       </method>
-      <method name="Decimal op_Subtraction(System.Object, C)" attrs="2198">
-        <size>16</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>54</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="System.Decimal op_Subtraction(System.Object, C)" attrs="2198">
+        <size>16</size>
+      </method>
     </type>
   </test>
   <test name="dtest-015.cs">
@@ -1829,9 +1843,6 @@
       <method name="Void DynRef(System.Object ByRef)" attrs="145">
         <size>5</size>
       </method>
-      <method name="Int32 DynParams(Int32, Int32, System.Int32[])" attrs="145">
-        <size>14</size>
-      </method>
       <method name="Void TestErrorVersions()" attrs="129">
         <size>198</size>
       </method>
@@ -1841,6 +1852,9 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Int32 DynParams(Int32, Int32, Int32[])" attrs="145">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="dtest-017.cs">
@@ -1858,12 +1872,6 @@
       <method name="System.Object Invoke(System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="System.Object EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -1882,6 +1890,14 @@
         <size>2</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.Object EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="dtest-018.cs">
     <type name="XValue">
@@ -1929,27 +1945,31 @@
       <method name="Void Invoke(System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="C+D2">
+      <method name="Void Invoke(System.Object ByRef)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
-    <type name="C+D2">
-      <method name="Void Invoke(System.Object ByRef)" attrs="454">
+    <type name="C+D">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object ByRef, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(System.Object ByRef, IAsyncResult)" attrs="454">
+    </type>
+    <type name="C+D2">
+      <method name="System.IAsyncResult BeginInvoke(System.Object ByRef, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.Object ByRef, System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -2050,13 +2070,13 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -2615,21 +2635,23 @@
       <method name="Int32 Invoke(Int32 ByRef)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32 ByRef, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(Int32 ByRef, IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test+&lt;Main&gt;c__DynamicSite0+Container0">
+      <method name="System.Object Invoke(System.Runtime.CompilerServices.CallSite, System.Object, Int32 ByRef)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
-    <type name="Test+&lt;Main&gt;c__DynamicSite0+Container0">
-      <method name="System.Object Invoke(System.Runtime.CompilerServices.CallSite, System.Object, Int32 ByRef)" attrs="454">
+    <type name="Test+D">
+      <method name="System.IAsyncResult BeginInvoke(Int32 ByRef, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Int32 EndInvoke(Int32 ByRef, System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -3245,9 +3267,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>26</size>
       </method>
@@ -3268,9 +3287,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>26</size>
       </method>
@@ -3302,6 +3318,16 @@
         <size>26</size>
       </method>
     </type>
+    <type name="Program+&lt;D1&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="Program+&lt;D2&gt;c__Iterator1">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="dtest-named-01.cs">
     <type name="Test">
@@ -4173,12 +4199,6 @@
   </test>
   <test name="gtest-038.cs">
     <type name="Queue`1[T]">
-      <method name="Queue`1+Node`1[T,T] GetFoo()" attrs="132">
-        <size>15</size>
-      </method>
-      <method name="Queue`1+Node`1[T,T] get_Foo()" attrs="2180">
-        <size>15</size>
-      </method>
       <method name="Void Test(T)" attrs="132">
         <size>13</size>
       </method>
@@ -4202,6 +4222,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Queue`1[T]">
+      <method name="Node`1 get_Foo()" attrs="2180">
+        <size>15</size>
+      </method>
+      <method name="Node`1 GetFoo()" attrs="132">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-039.cs">
     <type name="Zoo`1[T]">
@@ -4236,12 +4264,6 @@
   </test>
   <test name="gtest-040.cs">
     <type name="Stack`1[T]">
-      <method name="Stack`1+Foo`1[T,T] GetFoo(T)" attrs="134">
-        <size>15</size>
-      </method>
-      <method name="Stack`1+Bar`1[T,T] GetBar(T)" attrs="134">
-        <size>15</size>
-      </method>
       <method name="Void Test()" attrs="134">
         <size>67</size>
       </method>
@@ -4258,28 +4280,16 @@
       </method>
     </type>
     <type name="Stack`1+Foo`1[T,T]">
-      <method name="Stack`1+Bar`1[T,T] GetBar()" attrs="134">
-        <size>20</size>
-      </method>
       <method name="Void .ctor(T)" attrs="6278">
         <size>15</size>
       </method>
     </type>
     <type name="Stack`1+Bar`1[T,U]">
-      <method name="Stack`1+Foo`1[T,T] GetFoo(Stack`1[T])" attrs="134">
-        <size>15</size>
-      </method>
       <method name="Void .ctor(U)" attrs="6278">
         <size>15</size>
       </method>
     </type>
     <type name="Stack`1+Bar`1+Baz`1[T,U,V]">
-      <method name="Stack`1+Foo`1[T,T] GetFoo(Stack`1[T])" attrs="134">
-        <size>20</size>
-      </method>
-      <method name="Stack`1+Bar`1[T,V] GetBar()" attrs="134">
-        <size>20</size>
-      </method>
       <method name="Void .ctor(V)" attrs="6278">
         <size>15</size>
       </method>
@@ -4290,9 +4300,6 @@
       </method>
     </type>
     <type name="A`1+Test`1[U,T]">
-      <method name="A`1+Test`1+Nested`1[U,T,T] Foo()" attrs="150">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -4314,6 +4321,35 @@
       <method name="INode`1[T] GetNode()" attrs="134">
         <size>15</size>
       </method>
+      <method name="Foo`1 GetFoo(T)" attrs="134">
+        <size>15</size>
+      </method>
+      <method name="Bar`1 GetBar(T)" attrs="134">
+        <size>15</size>
+      </method>
+    </type>
+    <type name="Stack`1+Foo`1[T,T]">
+      <method name="Bar`1 GetBar()" attrs="134">
+        <size>20</size>
+      </method>
+    </type>
+    <type name="Stack`1+Bar`1[T,U]">
+      <method name="Foo`1 GetFoo(Stack`1[T])" attrs="134">
+        <size>15</size>
+      </method>
+    </type>
+    <type name="Stack`1+Bar`1+Baz`1[T,U,V]">
+      <method name="Foo`1 GetFoo(Stack`1[T])" attrs="134">
+        <size>20</size>
+      </method>
+      <method name="Bar`1 GetBar()" attrs="134">
+        <size>20</size>
+      </method>
+    </type>
+    <type name="A`1+Test`1[U,T]">
+      <method name="Nested`1 Foo()" attrs="150">
+        <size>10</size>
+      </method>
     </type>
   </test>
   <test name="gtest-041.cs">
@@ -4463,12 +4499,6 @@
       <method name="Void Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -4498,6 +4528,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-047.cs">
     <type name="X">
@@ -4553,9 +4591,6 @@
       <method name="Void C(T[,])" attrs="129">
         <size>2</size>
       </method>
-      <method name="Void C(System.Int32[,,])" attrs="129">
-        <size>2</size>
-      </method>
       <method name="Void D(Int32, T)" attrs="129">
         <size>2</size>
       </method>
@@ -4574,18 +4609,17 @@
         <size>7</size>
       </method>
     </type>
+    <type name="X`1[T]">
+      <method name="Void C(Int32[,,])" attrs="129">
+        <size>2</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-050.cs">
     <type name="D">
       <method name="Int32 Invoke(System.String, Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.String, Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -4594,12 +4628,6 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -4618,6 +4646,22 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.String, Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="E">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-051.cs">
     <type name="Foo`1[T]">
@@ -4964,12 +5008,6 @@
       <method name="B Invoke(A)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(A, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="B EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -4993,6 +5031,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test`2[A,B]">
+      <method name="System.IAsyncResult BeginInvoke(A, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="B EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-062.cs">
     <type name="X">
@@ -5010,9 +5056,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>116</size>
       </method>
@@ -5035,6 +5078,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>52</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-063.cs">
@@ -5063,9 +5109,6 @@
   </test>
   <test name="gtest-064.cs">
     <type name="Foo`1[T]">
-      <method name="Foo`1+Hello[T] GetHello()" attrs="134">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -5087,6 +5130,9 @@
       <method name="IHello`1[T] IFoo&lt;T&gt;.GetHello()" attrs="481">
         <size>15</size>
       </method>
+      <method name="Hello GetHello()" attrs="134">
+        <size>15</size>
+      </method>
     </type>
   </test>
   <test name="gtest-065.cs">
@@ -5145,9 +5191,6 @@
   </test>
   <test name="gtest-067.cs">
     <type name="Test">
-      <method name="Void Hello[U](Test+Foo`1[U], U)" attrs="134">
-        <size>2</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -5156,12 +5199,6 @@
       <method name="Int32 Invoke(T, T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, T, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -5177,6 +5214,19 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test">
+      <method name="Void Hello[U](Foo`1, U)" attrs="134">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="Test+Foo`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(T, T, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-068.cs">
     <type name="Martin.Foo`1[T]">
@@ -5313,9 +5363,6 @@
   </test>
   <test name="gtest-073.cs">
     <type name="MyList`1[T]">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -5357,6 +5404,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[T] GetEnumerator()" attrs="486">
         <size>15</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>15</size>
+      </method>
     </type>
   </test>
   <test name="gtest-074.cs">
@@ -5779,9 +5829,6 @@
   </test>
   <test name="gtest-091.cs">
     <type name="Foo`1[T]">
-      <method name="Foo`1+Node[T] Test[V]()" attrs="134">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -5799,6 +5846,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Foo`1[T]">
+      <method name="Node Test[V]()" attrs="134">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-092.cs">
     <type name="Element`1[T]">
@@ -5816,9 +5868,6 @@
       </method>
     </type>
     <type name="Foo`1[T]">
-      <method name="Foo`1+Node[T] Test()" attrs="134">
-        <size>60</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -5836,12 +5885,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Foo`1[T]">
+      <method name="Node Test()" attrs="134">
+        <size>60</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-093.cs">
     <type name="Foo`1[T]">
-      <method name="Void maketreer(Foo`1+Node[T] ByRef)" attrs="145">
-        <size>9</size>
-      </method>
       <method name="Void Hello[U]()" attrs="134">
         <size>9</size>
       </method>
@@ -5862,6 +5913,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Foo`1[T]">
+      <method name="Void maketreer(Node ByRef)" attrs="145">
+        <size>9</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-094.cs">
     <type name="LinkedList`1[T]">
@@ -6226,12 +6282,6 @@
       <method name="V Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="V EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -6258,6 +6308,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Mapper`2[T,V]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="V EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-108.cs">
     <type name="Test`1[T]">
@@ -6419,12 +6477,6 @@
       <method name="V Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="V EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -6448,6 +6500,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Mapper`2[T,V]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="V EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-114.cs">
     <type name="NaturalComparer`1[T]">
@@ -6467,14 +6527,14 @@
       </method>
     </type>
     <type name="X+Test">
-      <method name="Int32 CompareTo(X+Test)" attrs="486">
-        <size>10</size>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
       </method>
-      <method name="Boolean Equals(X+Test)" attrs="134">
+      <method name="Int32 CompareTo(Test)" attrs="486">
         <size>10</size>
       </method>
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
+      <method name="Boolean Equals(Test)" attrs="134">
+        <size>10</size>
       </method>
     </type>
   </test>
@@ -6483,20 +6543,11 @@
       <method name="R Invoke(A)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(A, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="R EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
     <type name="LinkedList`1[T]">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>15</size>
-      </method>
       <method name="Int32 get_Count()" attrs="2534">
         <size>15</size>
       </method>
@@ -6506,9 +6557,6 @@
       <method name="Void set_Item(Int32, T)" attrs="2534">
         <size>15</size>
       </method>
-      <method name="LinkedList`1+Node[T] get(Int32)" attrs="129">
-        <size>133</size>
-      </method>
       <method name="Void Add(T)" attrs="486">
         <size>15</size>
       </method>
@@ -6614,6 +6662,22 @@
         <size>15</size>
       </method>
     </type>
+    <type name="Mapper`2[A,R]">
+      <method name="System.IAsyncResult BeginInvoke(A, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="R EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="LinkedList`1[T]">
+      <method name="Node get(Int32)" attrs="129">
+        <size>133</size>
+      </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-116.cs">
     <type name="Slow.Test">
@@ -6815,13 +6879,13 @@
       <method name="Void Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -6836,12 +6900,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -6850,12 +6908,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -6868,6 +6920,22 @@
         <size>7</size>
       </method>
     </type>
+    <type name="A`1+Foo[T]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="A`1+Bar`1[T,U]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-124.cs">
     <type name="FooCollection`1[T]">
@@ -6949,15 +7017,6 @@
   </test>
   <test name="gtest-127.cs">
     <type name="A`1[T]">
-      <method name="Void add__changed(A`1+Changed[T])" attrs="2180">
-        <size>42</size>
-      </method>
-      <method name="Void remove__changed(A`1+Changed[T])" attrs="2180">
-        <size>42</size>
-      </method>
-      <method name="Void Register(A`1+Changed[T])" attrs="134">
-        <size>21</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -6966,12 +7025,6 @@
       <method name="Void Invoke(A`1[T])" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(A`1[T], System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -6987,6 +7040,25 @@
         <size>7</size>
       </method>
     </type>
+    <type name="A`1[T]">
+      <method name="Void add__changed(Changed)" attrs="2180">
+        <size>42</size>
+      </method>
+      <method name="Void remove__changed(Changed)" attrs="2180">
+        <size>42</size>
+      </method>
+      <method name="Void Register(Changed)" attrs="134">
+        <size>21</size>
+      </method>
+    </type>
+    <type name="A`1+Changed[T]">
+      <method name="System.IAsyncResult BeginInvoke(A`1[T], System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-128.cs">
     <type name="FLMID.Bugs.ParametersOne.Class`1[T]">
@@ -7105,17 +7177,11 @@
   </test>
   <test name="gtest-136.cs">
     <type name="Martin.A">
-      <method name="B op_Explicit(A)" attrs="2198">
-        <size>22</size>
-      </method>
       <method name="Void .ctor(Int64)" attrs="6278">
         <size>9</size>
       </method>
     </type>
     <type name="Martin.B">
-      <method name="A op_Implicit(B)" attrs="2198">
-        <size>22</size>
-      </method>
       <method name="Void .ctor(Int32)" attrs="6278">
         <size>9</size>
       </method>
@@ -7128,6 +7194,16 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Martin.A">
+      <method name="Martin.B op_Explicit(Martin.A)" attrs="2198">
+        <size>22</size>
+      </method>
+    </type>
+    <type name="Martin.B">
+      <method name="Martin.A op_Implicit(Martin.B)" attrs="2198">
+        <size>22</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-137.cs">
     <type name="X">
@@ -7311,9 +7387,6 @@
   </test>
   <test name="gtest-147.cs">
     <type name="B.Test`1[T]">
-      <method name="Void A.IFoo.Hello(IFoo)" attrs="481">
-        <size>2</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -7331,6 +7404,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="B.Test`1[T]">
+      <method name="Void A.IFoo.Hello(A.IFoo)" attrs="481">
+        <size>2</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-148.cs">
     <type name="Test1">
@@ -7483,12 +7561,6 @@
       <method name="Int32 Invoke(X)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(X, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -7518,6 +7590,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="T`1[X]">
+      <method name="System.IAsyncResult BeginInvoke(X, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-155.cs">
     <type name="MyClass`1[T]">
@@ -7633,15 +7713,15 @@
       <method name="Void Main()" attrs="150">
         <size>74</size>
       </method>
-      <method name="U apply[T,U](T, FP+Mapping`2[T,U])" attrs="145">
-        <size>16</size>
-      </method>
       <method name="System.String &lt;Main&gt;m__0(Int32)" attrs="145">
         <size>22</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="U apply[T,U](T, Mapping`2)" attrs="145">
+        <size>16</size>
+      </method>
     </type>
   </test>
   <test name="gtest-162.cs">
@@ -7654,12 +7734,6 @@
       <method name="Void Invoke(Generic`1[T], T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Generic`1[T], T, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -7672,6 +7746,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Generic`1+Delegate[T]">
+      <method name="System.IAsyncResult BeginInvoke(Generic`1[T], T, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-163.cs">
     <type name="Foo`1[T]">
@@ -7718,12 +7800,6 @@
       <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -7766,6 +7842,14 @@
         <size>22</size>
       </method>
     </type>
+    <type name="Int2Int">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-165.cs">
     <type name="C">
@@ -8107,12 +8191,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -8135,21 +8213,17 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-181.cs">
     <type name="X">
-      <method name="IEnumerator get_GetIt()" attrs="2193">
-        <size>15</size>
-      </method>
-      <method name="Void set_GetIt(IEnumerator)" attrs="2193">
-        <size>2</size>
-      </method>
-      <method name="IEnumerable get_Item(Int32)" attrs="2177">
-        <size>30</size>
-      </method>
-      <method name="Void set_Item(Int32, IEnumerable)" attrs="2177">
-        <size>2</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>211</size>
       </method>
@@ -8184,9 +8258,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>168</size>
       </method>
@@ -8203,6 +8274,25 @@
         <size>40</size>
       </method>
     </type>
+    <type name="X">
+      <method name="System.Collections.IEnumerator get_GetIt()" attrs="2193">
+        <size>15</size>
+      </method>
+      <method name="Void set_GetIt(System.Collections.IEnumerator)" attrs="2193">
+        <size>2</size>
+      </method>
+      <method name="System.Collections.IEnumerable get_Item(Int32)" attrs="2177">
+        <size>30</size>
+      </method>
+      <method name="Void set_Item(Int32, System.Collections.IEnumerable)" attrs="2177">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="X+&lt;&gt;c__Iterator1">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-182.cs">
     <type name="C1">
@@ -8246,9 +8336,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>91</size>
       </method>
@@ -8271,6 +8358,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[T] System.Collections.Generic.IEnumerable&lt;T&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-184.cs">
@@ -8407,12 +8497,6 @@
   </test>
   <test name="gtest-190.cs">
     <type name="Foo`1[T]">
-      <method name="Foo`1+Node[T] GetRoot()" attrs="134">
-        <size>14</size>
-      </method>
-      <method name="Void Test(Foo`1+Node[T])" attrs="134">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -8435,6 +8519,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Foo`1[T]">
+      <method name="Node GetRoot()" attrs="134">
+        <size>14</size>
+      </method>
+      <method name="Void Test(Node)" attrs="134">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-191.cs">
     <type name="Test2.Test`1[S]">
@@ -8482,9 +8574,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>26</size>
       </method>
@@ -8554,9 +8643,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[T] System.Collections.Generic.IEnumerable&lt;T&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
@@ -8580,9 +8666,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[System.Collections.Generic.KeyValuePair`2[S,T]] System.Collections.Generic.IEnumerable&lt;System.Collections.Generic.KeyValuePair&lt;S,T&gt;&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
@@ -8606,9 +8689,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[T] System.Collections.Generic.IEnumerable&lt;T&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
@@ -8632,9 +8712,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[T] System.Collections.Generic.IEnumerable&lt;T&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
@@ -8658,9 +8735,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[T] System.Collections.Generic.IEnumerable&lt;T&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
@@ -8684,9 +8758,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[T[]] System.Collections.Generic.IEnumerable&lt;T[]&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
@@ -8694,6 +8765,41 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test1.Test+&lt;Replace&gt;c__Iterator0`1[T]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="Test2.Test`1+&lt;Replace&gt;c__Iterator0`1[S,T]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="Test3.Test`1+&lt;Replace&gt;c__Iterator0`1[S,T]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="Test4.Test+&lt;Replace&gt;c__Iterator0`1[T]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="Test5.Test+&lt;Replace&gt;c__Iterator0`1[T]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="Test6.Test+&lt;Replace&gt;c__Iterator0`1[T]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="Test7.Test+&lt;Replace&gt;c__Iterator0`1[T]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-192.cs">
     <type name="xX">
@@ -8720,12 +8826,6 @@
       <method name="Int32 Invoke(S)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(S, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -8758,16 +8858,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="OrderedMultiDictionary`2[T,U]">
-      <method name="System.Collections.Generic.IEnumerator`1[T] EnumerateKeys(RedBlackTree`1+RangeTester[System.Collections.Generic.KeyValuePair`2[T,U]])" attrs="129">
-        <size>29</size>
-      </method>
-    </type>
-    <type name="RedBlackTree`1[S]">
-      <method name="System.Collections.Generic.IEnumerable`1[S] EnumerateRange(RedBlackTree`1+RangeTester[S])" attrs="134">
-        <size>23</size>
-      </method>
-    </type>
     <type name="RedBlackTree`1+&lt;EnumerateRange&gt;c__Iterator0[S]">
       <method name="S System.Collections.Generic.IEnumerator&lt;S&gt;.get_Current()" attrs="2529">
         <size>14</size>
@@ -8784,9 +8874,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[S] System.Collections.Generic.IEnumerable&lt;S&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
@@ -8794,6 +8881,29 @@
         <size>7</size>
       </method>
     </type>
+    <type name="OrderedMultiDictionary`2[T,U]">
+      <method name="System.Collections.Generic.IEnumerator`1[T] EnumerateKeys(RangeTester)" attrs="129">
+        <size>29</size>
+      </method>
+    </type>
+    <type name="RedBlackTree`1[S]">
+      <method name="System.Collections.Generic.IEnumerable`1[S] EnumerateRange(RangeTester)" attrs="134">
+        <size>23</size>
+      </method>
+    </type>
+    <type name="RedBlackTree`1+RangeTester[S]">
+      <method name="System.IAsyncResult BeginInvoke(S, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="RedBlackTree`1+&lt;EnumerateRange&gt;c__Iterator0[S]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-194.cs">
     <type name="RedBlackTree`1[S]">
@@ -8805,12 +8915,6 @@
       <method name="Int32 Invoke(S)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(S, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -8835,9 +8939,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>26</size>
       </method>
@@ -8850,18 +8951,6 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
-    </type>
-    <type name="RedBlackTree`1[S]">
-      <method name="System.Collections.Generic.IEnumerable`1[S] EnumerateRange(RedBlackTree`1+RangeTester[S])" attrs="134">
-        <size>23</size>
-      </method>
-    </type>
-    <type name="OrderedMultiDictionary`2[T,U]">
-      <method name="System.Collections.Generic.IEnumerator`1[T] EnumerateKeys(RedBlackTree`1+RangeTester[System.Collections.Generic.KeyValuePair`2[T,U]])" attrs="129">
-        <size>29</size>
-      </method>
-    </type>
-    <type name="RedBlackTree`1+&lt;EnumerateRange&gt;c__Iterator0[S]">
       <method name="System.Collections.Generic.IEnumerator`1[S] System.Collections.Generic.IEnumerable&lt;S&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
@@ -8886,20 +8975,37 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="gtest-195.cs">
+    <type name="RedBlackTree`1[S]">
+      <method name="System.Collections.Generic.IEnumerable`1[S] EnumerateRange(RangeTester)" attrs="134">
+        <size>23</size>
+      </method>
+    </type>
+    <type name="RedBlackTree`1+RangeTester[S]">
+      <method name="System.IAsyncResult BeginInvoke(S, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
     <type name="OrderedMultiDictionary`2[T,U]">
-      <method name="Void EnumerateKeys(RedBlackTree`1+RangeTester[System.Collections.Generic.KeyValuePair`2[T,U]])" attrs="129">
+      <method name="System.Collections.Generic.IEnumerator`1[T] EnumerateKeys(RangeTester)" attrs="129">
+        <size>29</size>
+      </method>
+    </type>
+    <type name="RedBlackTree`1+&lt;EnumerateRange&gt;c__Iterator0[S]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
         <size>14</size>
       </method>
+    </type>
+  </test>
+  <test name="gtest-195.cs">
+    <type name="OrderedMultiDictionary`2[T,U]">
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
     </type>
     <type name="RedBlackTree`1[S]">
-      <method name="Void EnumerateRange(RedBlackTree`1+RangeTester[S])" attrs="134">
-        <size>2</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -8908,12 +9014,6 @@
       <method name="Int32 Invoke(S)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(S, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -8926,6 +9026,24 @@
         <size>7</size>
       </method>
     </type>
+    <type name="OrderedMultiDictionary`2[T,U]">
+      <method name="Void EnumerateKeys(RangeTester)" attrs="129">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="RedBlackTree`1[S]">
+      <method name="Void EnumerateRange(RangeTester)" attrs="134">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="RedBlackTree`1+RangeTester[S]">
+      <method name="System.IAsyncResult BeginInvoke(S, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-196.cs">
     <type name="Dict">
@@ -9566,15 +9684,6 @@
       </method>
     </type>
     <type name="Set`1+Locator+Replace[Element]">
-      <method name="Void Invoke(Set`1+Node[Element])" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="IAsyncResult BeginInvoke(Set`1+Node[Element], System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -9590,18 +9699,31 @@
       </method>
     </type>
     <type name="Set`1+&lt;locate&gt;c__AnonStorey0[Element]">
-      <method name="Void &lt;&gt;m__0(Set`1+Node[Element])" attrs="131">
-        <size>16</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
     </type>
     <type name="Set`1[Element]">
-      <method name="Set`1+Locator[Element] locate(Element)" attrs="132">
+      <method name="Locator locate(Element)" attrs="132">
         <size>39</size>
       </method>
     </type>
+    <type name="Set`1+Locator+Replace[Element]">
+      <method name="Void Invoke(Node)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.IAsyncResult BeginInvoke(Node, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="Set`1+&lt;locate&gt;c__AnonStorey0[Element]">
+      <method name="Void &lt;&gt;m__0(Node)" attrs="131">
+        <size>16</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-226.cs">
     <type name="Container`1[T]">
@@ -9998,9 +10120,6 @@
   </test>
   <test name="gtest-247.cs">
     <type name="EnumerableBase`1[T]">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6276">
         <size>7</size>
       </method>
@@ -10108,6 +10227,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="EnumerableBase`1[T]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-248.cs">
     <type name="Foo`1[T]">
@@ -10129,9 +10253,6 @@
   </test>
   <test name="gtest-249.cs">
     <type name="EnumerableBase`1[T]">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6276">
         <size>7</size>
       </method>
@@ -10189,18 +10310,17 @@
         <size>15</size>
       </method>
     </type>
+    <type name="EnumerableBase`1[T]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-250.cs">
     <type name="Fun`2[R,S]">
       <method name="S Invoke(R)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(R, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="S EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -10223,6 +10343,14 @@
         <size>21</size>
       </method>
     </type>
+    <type name="Fun`2[R,S]">
+      <method name="System.IAsyncResult BeginInvoke(R, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="S EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-251.cs">
     <type name="SortedIndexedTester`1[T]">
@@ -10539,9 +10667,6 @@
   </test>
   <test name="gtest-263.cs">
     <type name="Foo`1[S]">
-      <method name="ICloneable Test(S)" attrs="134">
-        <size>20</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -10576,6 +10701,11 @@
         <size>22</size>
       </method>
     </type>
+    <type name="Foo`1[S]">
+      <method name="System.ICloneable Test(S)" attrs="134">
+        <size>20</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-264.cs">
     <type name="BaseList`1[SubType]">
@@ -10635,12 +10765,6 @@
       <method name="Void Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -10660,13 +10784,23 @@
       </method>
     </type>
     <type name="T+&lt;Foo&gt;c__AnonStorey0`1[T]">
-      <method name="Void &lt;&gt;m__0(IAsyncResult)" attrs="131">
-        <size>19</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
     </type>
+    <type name="Handler`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="T+&lt;Foo&gt;c__AnonStorey0`1[T]">
+      <method name="Void &lt;&gt;m__0(System.IAsyncResult)" attrs="131">
+        <size>19</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-268.cs">
     <type name="Test">
@@ -10744,9 +10878,6 @@
   </test>
   <test name="gtest-271.cs">
     <type name="Qux`2[X,V]">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -10816,6 +10947,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[V] GetEnumerator()" attrs="486">
         <size>15</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>15</size>
+      </method>
     </type>
   </test>
   <test name="gtest-272.cs">
@@ -10823,12 +10957,6 @@
       <method name="Void Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -10848,13 +10976,23 @@
       </method>
     </type>
     <type name="X+&lt;Foo&gt;c__AnonStorey0`1[T]">
-      <method name="Void &lt;&gt;m__0(IAsyncResult)" attrs="131">
-        <size>13</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
     </type>
+    <type name="Handler`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="X+&lt;Foo&gt;c__AnonStorey0`1[T]">
+      <method name="Void &lt;&gt;m__0(System.IAsyncResult)" attrs="131">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-273.cs">
     <type name="ThisBaseClass`3[A,B,C]">
@@ -11039,13 +11177,13 @@
       <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -11247,12 +11385,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -11284,16 +11416,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="gtest-290.cs">
-    <type name="GenericEventHandler`2[U,V]">
-      <method name="Void Invoke(U, V)" attrs="454">
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(U, V, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="gtest-290.cs">
+    <type name="GenericEventHandler`2[U,V]">
+      <method name="Void Invoke(U, V)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -11319,6 +11453,14 @@
         <size>2</size>
       </method>
     </type>
+    <type name="GenericEventHandler`2[U,V]">
+      <method name="System.IAsyncResult BeginInvoke(U, V, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-291.cs">
     <type name="Global">
@@ -11338,12 +11480,6 @@
       <method name="Void Invoke(TA)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(TA, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -11361,6 +11497,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test.Handler`1[TA]">
+      <method name="System.IAsyncResult BeginInvoke(TA, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-293.cs">
     <type name="Test`1[T]">
@@ -11466,12 +11610,6 @@
       <method name="Void Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -11495,6 +11633,14 @@
         <size>46</size>
       </method>
     </type>
+    <type name="TestFunc`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-299.cs">
     <type name="N.A">
@@ -11538,9 +11684,6 @@
   </test>
   <test name="gtest-302.cs">
     <type name="Test">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>7</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -11577,6 +11720,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>15</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>7</size>
+      </method>
     </type>
   </test>
   <test name="gtest-303.cs">
@@ -11687,12 +11833,6 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -11708,15 +11848,20 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Foo`1+F[T]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-308.cs">
     <type name="Test">
       <method name="System.Comparison`1[U] WrapComparison[U](System.Comparison`1[U])" attrs="150">
         <size>34</size>
       </method>
-      <method name="Test+MyComparison`1[W] WrapMyComparison[W](Test+MyComparison`1[W])" attrs="150">
-        <size>34</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -11725,12 +11870,6 @@
       <method name="Int32 Invoke(V, V)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(V, V, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -11768,6 +11907,19 @@
         <size>22</size>
       </method>
     </type>
+    <type name="Test">
+      <method name="MyComparison`1 WrapMyComparison[W](MyComparison`1)" attrs="150">
+        <size>34</size>
+      </method>
+    </type>
+    <type name="Test+MyComparison`1[V]">
+      <method name="System.IAsyncResult BeginInvoke(V, V, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-309.cs">
     <type name="Test`2[A,B]">
@@ -11956,9 +12108,6 @@
   </test>
   <test name="gtest-319.cs">
     <type name="Temp`1[T]">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -11977,9 +12126,6 @@
       </method>
     </type>
     <type name="Temp`1+&lt;GetEnumerator&gt;c__Iterator0[T]">
-      <method name="Temp`1+Foo[T] System.Collections.Generic.IEnumerator&lt;Temp&lt;T&gt;.Foo&gt;.get_Current()" attrs="2529">
-        <size>14</size>
-      </method>
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
@@ -12000,6 +12146,14 @@
       <method name="System.Collections.Generic.IEnumerator`1[Temp`1+Foo[T]] GetEnumerator()" attrs="486">
         <size>15</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>15</size>
+      </method>
+    </type>
+    <type name="Temp`1+&lt;GetEnumerator&gt;c__Iterator0[T]">
+      <method name="Foo System.Collections.Generic.IEnumerator&lt;Temp&lt;T&gt;.Foo&gt;.get_Current()" attrs="2529">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-320.cs">
@@ -12035,9 +12189,6 @@
       <method name="Void Run()" attrs="134">
         <size>50</size>
       </method>
-      <method name="Void TestMethod[T](System.String, App+TGenericDelegate`1[T])" attrs="129">
-        <size>26</size>
-      </method>
       <method name="Void ADelegate[T](System.String)" attrs="129">
         <size>13</size>
       </method>
@@ -12049,13 +12200,20 @@
       <method name="Void Invoke(System.String)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="App">
+      <method name="Void TestMethod[T](System.String, TGenericDelegate`1)" attrs="129">
+        <size>26</size>
+      </method>
+    </type>
+    <type name="App+TGenericDelegate`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -12070,12 +12228,6 @@
       <method name="Void Invoke(K, V)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(K, V, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -12088,12 +12240,17 @@
         <size>9</size>
       </method>
     </type>
+    <type name="MyBase`2+Callback[K,V]">
+      <method name="System.IAsyncResult BeginInvoke(K, V, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-323.cs">
     <type name="MyBase`2[K,V]">
-      <method name="Void Hello(MyBase`2+Callback[K,V])" attrs="134">
-        <size>2</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -12104,9 +12261,6 @@
       </method>
     </type>
     <type name="X">
-      <method name="Void Test(MyBase`2+Callback[System.String,System.Int32])" attrs="134">
-        <size>9</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
@@ -12114,18 +12268,22 @@
         <size>8</size>
       </method>
     </type>
+    <type name="MyBase`2[K,V]">
+      <method name="Void Hello(Callback)" attrs="134">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="X">
+      <method name="Void Test(Callback)" attrs="134">
+        <size>9</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-324.cs">
     <type name="A">
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -12166,6 +12324,14 @@
         <size>58</size>
       </method>
     </type>
+    <type name="A">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-325.cs">
     <type name="SomeClass`1[T]">
@@ -12236,9 +12402,6 @@
       <method name="Void Main()" attrs="150">
         <size>35</size>
       </method>
-      <method name="Void TestMethod(System.String, System.Collections.Generic.List`1[System.String], App+MyClass[])" attrs="145">
-        <size>14</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -12248,6 +12411,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="App">
+      <method name="Void TestMethod(System.String, System.Collections.Generic.List`1[System.String], MyClass[])" attrs="145">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-329.cs">
     <type name="NullableInt">
@@ -12261,9 +12429,6 @@
   </test>
   <test name="gtest-330.cs">
     <type name="BaseCollection`1[T]">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>25</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>18</size>
       </method>
@@ -12290,6 +12455,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[T] System.Collections.Generic.IEnumerable&lt;T&gt;.GetEnumerator()" attrs="481">
         <size>25</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>25</size>
+      </method>
     </type>
   </test>
   <test name="gtest-331.cs">
@@ -12357,27 +12525,31 @@
       <method name="Void Invoke(Boolean)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Boolean, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test+DelegateB">
+      <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
-    <type name="Test+DelegateB">
-      <method name="Int32 Invoke(Int32)" attrs="454">
+    <type name="Test+DelegateA">
+      <method name="System.IAsyncResult BeginInvoke(Boolean, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test+DelegateB">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -12510,9 +12682,6 @@
       <method name="Boolean get_IsReadOnly()" attrs="2534">
         <size>7</size>
       </method>
-      <method name="IEnumerator GetEnumerator()" attrs="486">
-        <size>7</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -12526,6 +12695,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[T] System.Collections.Generic.IEnumerable&lt;T&gt;.GetEnumerator()" attrs="481">
         <size>7</size>
       </method>
+      <method name="System.Collections.IEnumerator GetEnumerator()" attrs="486">
+        <size>7</size>
+      </method>
     </type>
   </test>
   <test name="gtest-339.cs">
@@ -12533,9 +12705,6 @@
       <method name="Void Main()" attrs="150">
         <size>12</size>
       </method>
-      <method name="Void SerializeDictionary(IDictionary)" attrs="145">
-        <size>2</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -12576,9 +12745,6 @@
       <method name="Boolean System.Collections.Generic.ICollection&lt;System.Collections.Generic.KeyValuePair&lt;string,object&gt;&gt;.get_IsReadOnly()" attrs="2529">
         <size>7</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6276">
         <size>7</size>
       </method>
@@ -12616,6 +12782,16 @@
         <size>0</size>
       </method>
     </type>
+    <type name="Program">
+      <method name="Void SerializeDictionary(System.Collections.IDictionary)" attrs="145">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="LazyDictionary">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-340.cs">
     <type name="Tests">
@@ -12757,12 +12933,6 @@
   </test>
   <test name="gtest-347.cs">
     <type name="X">
-      <method name="IEnumerable Enumerable(Int32)" attrs="134">
-        <size>7</size>
-      </method>
-      <method name="IEnumerable Enumerable(System.String)" attrs="134">
-        <size>7</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
@@ -12772,6 +12942,12 @@
       <method name="System.Collections.Generic.IEnumerable`1[T] Enumerable[T](System.String)" attrs="134">
         <size>7</size>
       </method>
+      <method name="System.Collections.IEnumerable Enumerable(Int32)" attrs="134">
+        <size>7</size>
+      </method>
+      <method name="System.Collections.IEnumerable Enumerable(System.String)" attrs="134">
+        <size>7</size>
+      </method>
     </type>
   </test>
   <test name="gtest-348.cs">
@@ -12805,12 +12981,6 @@
       <method name="Int32 Main()" attrs="150">
         <size>121</size>
       </method>
-      <method name="Int32 f2(IList, IList)" attrs="145">
-        <size>10</size>
-      </method>
-      <method name="Int32 f2(IList, System.Object)" attrs="145">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -12819,13 +12989,23 @@
       <method name="R Invoke(T1, T2)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T1, T2, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="R EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="X">
+      <method name="Int32 f2(System.Collections.IList, System.Collections.IList)" attrs="145">
+        <size>10</size>
+      </method>
+      <method name="Int32 f2(System.Collections.IList, System.Object)" attrs="145">
+        <size>10</size>
+      </method>
+    </type>
+    <type name="X+Function`3[T1,T2,R]">
+      <method name="System.IAsyncResult BeginInvoke(T1, T2, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="R EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -12920,9 +13100,6 @@
   </test>
   <test name="gtest-354.cs">
     <type name="M">
-      <method name="Void IC.Method(System.Int32[])" attrs="481">
-        <size>2</size>
-      </method>
       <method name="System.String IA&lt;string&gt;.Method(Int32)" attrs="481">
         <size>7</size>
       </method>
@@ -12935,6 +13112,9 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Void IC.Method(Int32[])" attrs="481">
+        <size>2</size>
+      </method>
     </type>
   </test>
   <test name="gtest-355.cs">
@@ -12974,9 +13154,6 @@
   </test>
   <test name="gtest-356.cs">
     <type name="A`1[T]">
-      <method name="Void Foo(B+E)" attrs="129">
-        <size>2</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -13004,6 +13181,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="A`1[T]">
+      <method name="Void Foo(E)" attrs="129">
+        <size>2</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-357.cs">
     <type name="C`1[T]">
@@ -13034,14 +13216,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="S3">
-      <method name="Decimal op_Inequality(S3, System.Object)" attrs="2198">
-        <size>15</size>
-      </method>
-      <method name="Decimal op_Equality(S3, System.Object)" attrs="2198">
-        <size>15</size>
-      </method>
-    </type>
     <type name="Test">
       <method name="Int32 Main()" attrs="150">
         <size>122</size>
@@ -13058,6 +13232,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="S3">
+      <method name="System.Decimal op_Inequality(S3, System.Object)" attrs="2198">
+        <size>15</size>
+      </method>
+      <method name="System.Decimal op_Equality(S3, System.Object)" attrs="2198">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-359.cs">
     <type name="BaseGeneric`1[T]">
@@ -13146,9 +13328,6 @@
       <method name="Int32 Main()" attrs="150">
         <size>189</size>
       </method>
-      <method name="Void Method(Thing+Handler, System.String[])" attrs="150">
-        <size>2</size>
-      </method>
       <method name="Void &lt;Main&gt;m__0()" attrs="145">
         <size>2</size>
       </method>
@@ -13163,13 +13342,20 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Thing">
+      <method name="Void Method(Handler, System.String[])" attrs="150">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="Thing+Handler">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -13304,9 +13490,6 @@
   </test>
   <test name="gtest-369.cs">
     <type name="Db4objects.Db4o.Internal.ObjectContainerBase">
-      <method name="IList Query()" attrs="486">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6276">
         <size>7</size>
       </method>
@@ -13328,6 +13511,9 @@
       <method name="System.Collections.Generic.IList`1[Extent] Query[Extent](System.Collections.Generic.IList`1[Extent], System.Collections.Generic.IList`1[Extent])" attrs="486">
         <size>10</size>
       </method>
+      <method name="System.Collections.IList Query()" attrs="486">
+        <size>10</size>
+      </method>
     </type>
   </test>
   <test name="gtest-370.cs">
@@ -13657,12 +13843,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -13675,6 +13855,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Func`2[TArg,TRet]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-386.cs">
     <type name="MyType">
@@ -13801,12 +13989,6 @@
   </test>
   <test name="gtest-394.cs">
     <type name="Test">
-      <method name="Void FindMembers(Test+MemberFilter)" attrs="150">
-        <size>2</size>
-      </method>
-      <method name="Void GetMethodGroup(Test+MemberFilter)" attrs="150">
-        <size>44</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
@@ -13821,13 +14003,23 @@
       <method name="Boolean Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Boolean EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test">
+      <method name="Void FindMembers(MemberFilter)" attrs="150">
+        <size>2</size>
+      </method>
+      <method name="Void GetMethodGroup(MemberFilter)" attrs="150">
+        <size>44</size>
+      </method>
+    </type>
+    <type name="Test+MemberFilter">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Boolean EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -13917,15 +14109,6 @@
   </test>
   <test name="gtest-398.cs">
     <type name="ToStr">
-      <method name="System.String Invoke(System.String, IFormatProvider)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="IAsyncResult BeginInvoke(System.String, IFormatProvider, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="System.String EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -13949,6 +14132,17 @@
         <size>7</size>
       </method>
     </type>
+    <type name="ToStr">
+      <method name="System.String Invoke(System.String, System.IFormatProvider)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.IAsyncResult BeginInvoke(System.String, System.IFormatProvider, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.String EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-399.cs">
     <type name="TestIssue.Base">
@@ -14138,18 +14332,12 @@
       <method name="Void Test_4(Boolean, Boolean)" attrs="129">
         <size>40</size>
       </method>
-      <method name="Void Test_5(Boolean, IDisposable)" attrs="129">
-        <size>46</size>
-      </method>
       <method name="Void Test_6(Boolean)" attrs="129">
         <size>48</size>
       </method>
       <method name="Void Test_7(System.Object)" attrs="129">
         <size>9</size>
       </method>
-      <method name="Void Test_8(DateTime)" attrs="129">
-        <size>39</size>
-      </method>
       <method name="Void Test_9()" attrs="129">
         <size>44</size>
       </method>
@@ -14204,6 +14392,12 @@
       <method name="System.Nullable`1[System.Int32] Test_14()" attrs="129">
         <size>68</size>
       </method>
+      <method name="Void Test_5(Boolean, System.IDisposable)" attrs="129">
+        <size>46</size>
+      </method>
+      <method name="Void Test_8(System.DateTime)" attrs="129">
+        <size>39</size>
+      </method>
     </type>
   </test>
   <test name="gtest-410.cs">
@@ -14353,9 +14547,6 @@
       </method>
     </type>
     <type name="Base">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>20</size>
-      </method>
       <method name="Void .ctor()" attrs="6276">
         <size>7</size>
       </method>
@@ -14368,6 +14559,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Base">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>20</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-418.cs">
     <type name="N.Nested">
@@ -14533,12 +14729,6 @@
       <method name="Void Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -14551,6 +14741,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="EventClass`1+HookDelegate[T]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-426.cs">
     <type name="OverloadTest.MyClass`1[T]">
@@ -14580,12 +14778,6 @@
       <method name="Void Invoke(System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -14594,12 +14786,6 @@
       <method name="Void Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -14624,6 +14810,22 @@
         <size>7</size>
       </method>
     </type>
+    <type name="EventHandler">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="EventHandler`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-428.cs">
     <type name="CInt">
@@ -14920,17 +15122,17 @@
       <method name="Void Bar(Int32 ByRef)" attrs="145">
         <size>2</size>
       </method>
-      <method name="Void Bar(System.Int32[])" attrs="145">
-        <size>2</size>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
       </method>
-      <method name="Void Bar(System.Int32[,])" attrs="145">
+      <method name="Void Bar(Int32[])" attrs="145">
         <size>2</size>
       </method>
-      <method name="Void Bar(System.Int32[,,])" attrs="145">
+      <method name="Void Bar(Int32[,])" attrs="145">
         <size>2</size>
       </method>
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
+      <method name="Void Bar(Int32[,,])" attrs="145">
+        <size>2</size>
       </method>
     </type>
   </test>
@@ -14961,9 +15163,6 @@
   </test>
   <test name="gtest-448.cs">
     <type name="Impl`1[T]">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -14996,6 +15195,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[T] GetEnumerator()" attrs="486">
         <size>10</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>10</size>
+      </method>
     </type>
   </test>
   <test name="gtest-449.cs">
@@ -15139,9 +15341,6 @@
   </test>
   <test name="gtest-458.cs">
     <type name="MyList`1[T]">
-      <method name="MyList`1+Helper`2[T,U,V] GetHelper[U,V]()" attrs="134">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -15159,6 +15358,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="MyList`1[T]">
+      <method name="Helper`2 GetHelper[U,V]()" attrs="134">
+        <size>10</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-459.cs">
     <type name="GenericTest.OuterGeneric`1[T]">
@@ -15230,9 +15434,6 @@
       </method>
     </type>
     <type name="Test.TheBox`1[T]">
-      <method name="U GetById[U](Guid)" attrs="134">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -15245,6 +15446,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test.TheBox`1[T]">
+      <method name="U GetById[U](System.Guid)" attrs="134">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-462.cs">
     <type name="Program">
@@ -15405,9 +15611,6 @@
   </test>
   <test name="gtest-472.cs">
     <type name="C`1[T]">
-      <method name="Void CopyUnsafe(T[], System.Int64[])" attrs="454">
-        <size>2</size>
-      </method>
       <method name="Boolean CopyUnsafe(T[], Int64)" attrs="454">
         <size>10</size>
       </method>
@@ -15426,6 +15629,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="C`1[T]">
+      <method name="Void CopyUnsafe(T[], Int64[])" attrs="454">
+        <size>2</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-473.cs">
     <type name="A`1[X]">
@@ -15525,7 +15733,7 @@
       </method>
     </type>
     <type name="Test`1[T]">
-      <method name="Test`1+B[T] First()" attrs="134">
+      <method name="B First()" attrs="134">
         <size>18</size>
       </method>
     </type>
@@ -15675,9 +15883,6 @@
       </method>
     </type>
     <type name="Int32Collection">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>25</size>
-      </method>
       <method name="Int32 get_Count()" attrs="2182">
         <size>20</size>
       </method>
@@ -15696,6 +15901,9 @@
       <method name="Void .ctor()" attrs="6278">
         <size>18</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>25</size>
+      </method>
     </type>
   </test>
   <test name="gtest-484.cs">
@@ -15729,9 +15937,6 @@
   </test>
   <test name="gtest-486.cs">
     <type name="MyCollection`1[T]">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>10</size>
-      </method>
       <method name="Int32 get_Count()" attrs="2534">
         <size>10</size>
       </method>
@@ -15781,6 +15986,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[T] GetEnumerator()" attrs="486">
         <size>10</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>10</size>
+      </method>
     </type>
   </test>
   <test name="gtest-487.cs">
@@ -15849,9 +16057,6 @@
   </test>
   <test name="gtest-490.cs">
     <type name="Foo">
-      <method name="IEnumerator GetEnumerator()" attrs="486">
-        <size>25</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
@@ -15861,6 +16066,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[Foo] System.Collections.Generic.IEnumerable&lt;Foo&gt;.GetEnumerator()" attrs="481">
         <size>25</size>
       </method>
+      <method name="System.Collections.IEnumerator GetEnumerator()" attrs="486">
+        <size>25</size>
+      </method>
     </type>
   </test>
   <test name="gtest-491.cs">
@@ -15916,9 +16124,6 @@
       </method>
     </type>
     <type name="MonoGenericIteratorTest.MyCollectionBase`1[T]">
-      <method name="IEnumerator GetEnumerator()" attrs="454">
-        <size>25</size>
-      </method>
       <method name="Void .ctor()" attrs="6276">
         <size>7</size>
       </method>
@@ -15936,6 +16141,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="MonoGenericIteratorTest.MyCollectionBase`1[T]">
+      <method name="System.Collections.IEnumerator GetEnumerator()" attrs="454">
+        <size>25</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-494.cs">
     <type name="Grid`1[CT]">
@@ -16509,9 +16719,6 @@
       </method>
     </type>
     <type name="C">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>7</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -16538,6 +16745,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[A] System.Collections.Generic.IEnumerable&lt;A&gt;.GetEnumerator()" attrs="481">
         <size>24</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>7</size>
+      </method>
     </type>
   </test>
   <test name="gtest-521.cs">
@@ -16545,12 +16755,6 @@
       <method name="Void Invoke(System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -16585,6 +16789,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-522.cs">
     <type name="C`1[T]">
@@ -16887,9 +17099,6 @@
       </method>
     </type>
     <type name="List`1+Comp`1[X,Y]">
-      <method name="List`1+Comp`1[Y,X] flip(Y, X)" attrs="134">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -16907,6 +17116,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="List`1+Comp`1[X,Y]">
+      <method name="Comp`1 flip(Y, X)" attrs="134">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-534.cs">
     <type name="A">
@@ -16985,9 +17199,6 @@
   </test>
   <test name="gtest-538.cs">
     <type name="S">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>7</size>
-      </method>
       <method name="Void .ctor(Int32)" attrs="6278">
         <size>2</size>
       </method>
@@ -17027,6 +17238,11 @@
         <size>23</size>
       </method>
     </type>
+    <type name="S">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>7</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-539.cs">
     <type name="S">
@@ -17115,9 +17331,6 @@
       </method>
     </type>
     <type name="A`1+B[T]">
-      <method name="A`1+B[T] getT()" attrs="198">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -17130,6 +17343,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="A`1+B[T]">
+      <method name="B getT()" attrs="198">
+        <size>10</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-543.cs">
     <type name="Blah`1[T]">
@@ -17138,9 +17356,6 @@
       </method>
     </type>
     <type name="Blah`1+WrapperWrapper`1[T,N]">
-      <method name="Blah`1+WrapperWrapper`1[T,N] NewWrapperWrapper(Wrapper`1[N])" attrs="134">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>13</size>
       </method>
@@ -17164,6 +17379,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Blah`1+WrapperWrapper`1[T,N]">
+      <method name="WrapperWrapper`1 NewWrapperWrapper(Wrapper`1[N])" attrs="134">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-544.cs">
     <type name="A`1[T]">
@@ -17241,9 +17461,6 @@
   </test>
   <test name="gtest-546.cs">
     <type name="Factory">
-      <method name="Factory+S`2[F1,F2] Create[F1,F2](F1, F2)" attrs="150">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -17264,6 +17481,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Factory">
+      <method name="S`2 Create[F1,F2](F1, F2)" attrs="150">
+        <size>10</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-547.cs">
     <type name="Foo">
@@ -17329,21 +17551,23 @@
       <method name="Int32 get_DestinationDimension()" attrs="2534">
         <size>10</size>
       </method>
-      <method name="Decimal get_Item(Int32)" attrs="2534">
-        <size>7</size>
-      </method>
-      <method name="Void set_Item(Int32, Decimal)" attrs="2534">
-        <size>7</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
     </type>
     <type name="Foo.Magic`1[T]">
-      <method name="Void Upsample(Foo.Magic`1+IUpDown[T])" attrs="150">
+      <method name="Void Upsample(IUpDown)" attrs="150">
         <size>9</size>
       </method>
     </type>
+    <type name="Foo.Instance">
+      <method name="System.Decimal get_Item(Int32)" attrs="2534">
+        <size>7</size>
+      </method>
+      <method name="Void set_Item(Int32, System.Decimal)" attrs="2534">
+        <size>7</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-551.cs">
     <type name="Base`1[T]">
@@ -17449,9 +17673,6 @@
       </method>
     </type>
     <type name="A2+N`1[T]">
-      <method name="A2+N`1[T] Method()" attrs="150">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -17464,6 +17685,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="A2+N`1[T]">
+      <method name="N`1 Method()" attrs="150">
+        <size>10</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-557.cs">
     <type name="Test">
@@ -17703,12 +17929,6 @@
       <method name="Void Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -17717,34 +17937,16 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
     <type name="A`1+Constructor[T]">
-      <method name="Void Before[U](A`1+Context`1+D[T,U])" attrs="134">
-        <size>2</size>
-      </method>
-      <method name="Void Before[U,V](A`1+Context`1+D2`1[T,U,V])" attrs="134">
-        <size>2</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
     </type>
     <type name="A`1+Constructor+Nested[T]">
-      <method name="Void Test[U](A`1+Context`1+D[T,U])" attrs="150">
-        <size>15</size>
-      </method>
-      <method name="Void Test[U,V](A`1+Context`1+D2`1[T,U,V])" attrs="150">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -17757,6 +17959,38 @@
         <size>7</size>
       </method>
     </type>
+    <type name="A`1+Context`1+D[T,U]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="A`1+Context`1+D2`1[T,U,V]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="A`1+Constructor[T]">
+      <method name="Void Before[U](D)" attrs="134">
+        <size>2</size>
+      </method>
+      <method name="Void Before[U,V](D2`1)" attrs="134">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="A`1+Constructor+Nested[T]">
+      <method name="Void Test[U](D)" attrs="150">
+        <size>15</size>
+      </method>
+      <method name="Void Test[U,V](D2`1)" attrs="150">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-567.cs">
     <type name="C">
@@ -17860,9 +18094,6 @@
   </test>
   <test name="gtest-572.cs">
     <type name="C">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>7</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>15</size>
       </method>
@@ -17872,6 +18103,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Int16] GetEnumerator()" attrs="486">
         <size>10</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>7</size>
+      </method>
     </type>
   </test>
   <test name="gtest-573.cs">
@@ -17925,9 +18159,6 @@
       </method>
     </type>
     <type name="DirectedCollectionBase`1[T3]">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6276">
         <size>7</size>
       </method>
@@ -17943,9 +18174,6 @@
       </method>
     </type>
     <type name="EnumerableBase`1[T6]">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6276">
         <size>7</size>
       </method>
@@ -17973,6 +18201,16 @@
         <size>10</size>
       </method>
     </type>
+    <type name="DirectedCollectionBase`1[T3]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>10</size>
+      </method>
+    </type>
+    <type name="EnumerableBase`1[T6]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>10</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-575.cs">
     <type name="C`1[T1]">
@@ -18337,12 +18575,6 @@
       <method name="System.Tuple`2[D1,DR1] Invoke(D1)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(D1, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="System.Tuple`2[D1,DR1] EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -18371,6 +18603,14 @@
         <size>15</size>
       </method>
     </type>
+    <type name="Parser`2[D1,DR1]">
+      <method name="System.IAsyncResult BeginInvoke(D1, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.Tuple`2[D1,DR1] EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-594.cs">
     <type name="C">
@@ -18621,12 +18861,6 @@
       <method name="T Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="T EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -18654,6 +18888,35 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Factory`2+InstantiateMethod`1[TKey,TBase,T]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="T EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+  </test>
+  <test name="gtest-603.cs">
+    <type name="A`1[T]">
+      <method name="T op_Explicit(A`1[T])" attrs="2198">
+        <size>15</size>
+      </method>
+      <method name="Void .ctor(T)" attrs="6278">
+        <size>15</size>
+      </method>
+    </type>
+    <type name="Test">
+      <method name="Int32 Main()" attrs="150">
+        <size>54</size>
+      </method>
+      <method name="Int32 N(Int32)" attrs="145">
+        <size>10</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-anontype-01.cs">
     <type name="Test">
@@ -19144,9 +19407,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>211</size>
       </method>
@@ -19206,6 +19466,11 @@
         <size>15</size>
       </method>
     </type>
+    <type name="Test+&lt;Select&gt;c__Iterator0`1[T]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-autoproperty-01.cs">
     <type name="Test">
@@ -19666,9 +19931,6 @@
       <method name="Int32 ReturnNumber()" attrs="145">
         <size>10</size>
       </method>
-      <method name="Void AssertNodeType(System.Linq.Expressions.LambdaExpression, ExpressionType)" attrs="145">
-        <size>57</size>
-      </method>
       <method name="Void Assert[T](T, T)" attrs="145">
         <size>10</size>
       </method>
@@ -20631,12 +20893,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -20645,12 +20901,6 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -20709,6 +20959,25 @@
       <method name="Void LessThanTest_9()" attrs="129">
         <size>184</size>
       </method>
+      <method name="Void AssertNodeType(System.Linq.Expressions.LambdaExpression, System.Linq.Expressions.ExpressionType)" attrs="145">
+        <size>57</size>
+      </method>
+    </type>
+    <type name="Tester+EmptyDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="Tester+IntDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
     </type>
   </test>
   <test name="gtest-etree-02.cs">
@@ -20783,9 +21052,6 @@
   </test>
   <test name="gtest-etree-05.cs">
     <type name="C">
-      <method name="Void AssertNodeType(System.Linq.Expressions.LambdaExpression, ExpressionType)" attrs="145">
-        <size>57</size>
-      </method>
       <method name="Void Assert[T](T, T)" attrs="145">
         <size>48</size>
       </method>
@@ -20795,6 +21061,9 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Void AssertNodeType(System.Linq.Expressions.LambdaExpression, System.Linq.Expressions.ExpressionType)" attrs="145">
+        <size>57</size>
+      </method>
     </type>
   </test>
   <test name="gtest-etree-06.cs">
@@ -20815,12 +21084,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -20829,12 +21092,6 @@
       <method name="Int32* Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32* EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -20859,6 +21116,22 @@
         <size>7</size>
       </method>
     </type>
+    <type name="EmptyDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="UnsafeDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32* EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-etree-08.cs">
     <type name="Foo">
@@ -20886,9 +21159,6 @@
       <method name="Int32 Main()" attrs="150">
         <size>296</size>
       </method>
-      <method name="System.Int64[] GetValues()" attrs="145">
-        <size>26</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -20898,6 +21168,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Mono.C">
+      <method name="Int64[] GetValues()" attrs="145">
+        <size>26</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-etree-10.cs">
     <type name="Foo`1[T]">
@@ -20940,9 +21215,6 @@
       <method name="Void Invalid(Int32)" attrs="134">
         <size>125</size>
       </method>
-      <method name="Void Other(System.Int32[])" attrs="134">
-        <size>2</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -20952,6 +21224,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test">
+      <method name="Void Other(Int32[])" attrs="134">
+        <size>2</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-etree-12.cs">
     <type name="TestCase">
@@ -20990,9 +21267,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>148</size>
       </method>
@@ -21020,6 +21294,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-etree-14.cs">
@@ -21052,9 +21329,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>336</size>
       </method>
@@ -21082,6 +21356,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[T] System.Collections.Generic.IEnumerable&lt;T&gt;.GetEnumerator()" attrs="481">
         <size>52</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-etree-15.cs">
@@ -21626,15 +21903,15 @@
   </test>
   <test name="gtest-exmethod-15.cs">
     <type name="C">
-      <method name="TAttribute GetCustomAttribute[TAttribute](ICustomAttributeProvider)" attrs="150">
+      <method name="Void Main()" attrs="150">
+        <size>2</size>
+      </method>
+      <method name="TAttribute GetCustomAttribute[TAttribute](System.Reflection.ICustomAttributeProvider)" attrs="150">
         <size>23</size>
       </method>
-      <method name="TAttribute[] GetCustomAttributes[TAttribute](ICustomAttributeProvider)" attrs="150">
+      <method name="TAttribute[] GetCustomAttributes[TAttribute](System.Reflection.ICustomAttributeProvider)" attrs="150">
         <size>10</size>
       </method>
-      <method name="Void Main()" attrs="150">
-        <size>2</size>
-      </method>
     </type>
   </test>
   <test name="gtest-exmethod-16.cs">
@@ -21650,12 +21927,6 @@
       <method name="System.String Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="System.String EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -21680,6 +21951,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.String EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-exmethod-17.cs">
     <type name="MainClass">
@@ -21729,12 +22008,6 @@
       <method name="System.String Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="System.String EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -21744,6 +22017,14 @@
         <size>11</size>
       </method>
     </type>
+    <type name="Test+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.String EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-exmethod-20.cs">
     <type name="Outer.Inner.Test">
@@ -21841,9 +22122,6 @@
       <method name="Void Main()" attrs="150">
         <size>18</size>
       </method>
-      <method name="System.String Pan(System.Byte[])" attrs="147">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -21853,6 +22131,11 @@
         <size>14</size>
       </method>
     </type>
+    <type name="Bar.Program">
+      <method name="System.String Pan(Byte[])" attrs="147">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-exmethod-28.cs">
     <type name="Foo">
@@ -21905,9 +22188,6 @@
   </test>
   <test name="gtest-exmethod-30.cs">
     <type name="Test">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>10</size>
-      </method>
       <method name="Int32 get_First()" attrs="2182">
         <size>10</size>
       </method>
@@ -21930,6 +22210,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] GetEnumerator()" attrs="486">
         <size>10</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>10</size>
+      </method>
     </type>
   </test>
   <test name="gtest-exmethod-31.cs">
@@ -21954,9 +22237,6 @@
   </test>
   <test name="gtest-exmethod-32.cs">
     <type name="A">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>10</size>
-      </method>
       <method name="Int32 get_Count()" attrs="2180">
         <size>10</size>
       </method>
@@ -21973,13 +22253,20 @@
       </method>
     </type>
     <type name="Extensions">
-      <method name="Int32 Count(IEnumerable)" attrs="150">
-        <size>10</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
     </type>
+    <type name="A">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>10</size>
+      </method>
+    </type>
+    <type name="Extensions">
+      <method name="Int32 Count(System.Collections.IEnumerable)" attrs="150">
+        <size>10</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-exmethod-33.cs">
     <type name="Prop">
@@ -21996,9 +22283,6 @@
       <method name="I get_Prop()" attrs="2182">
         <size>10</size>
       </method>
-      <method name="System.Int32[] get_Loc()" attrs="2182">
-        <size>10</size>
-      </method>
       <method name="Void Test()" attrs="129">
         <size>14</size>
       </method>
@@ -22008,6 +22292,9 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Int32[] get_Loc()" attrs="2182">
+        <size>10</size>
+      </method>
     </type>
   </test>
   <test name="gtest-exmethod-34.cs">
@@ -22099,11 +22386,6 @@
         <size>38</size>
       </method>
     </type>
-    <type name="Repro2.ExtensionMethods">
-      <method name="Color Transparent(Color)" attrs="150">
-        <size>14</size>
-      </method>
-    </type>
     <type name="Repro2.MainClass">
       <method name="Int32 Main()" attrs="150">
         <size>21</size>
@@ -22112,6 +22394,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Repro2.ExtensionMethods">
+      <method name="Repro2.Color Transparent(Repro2.Color)" attrs="150">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-exmethod-39.cs">
     <type name="Extra.S">
@@ -22243,23 +22530,11 @@
       <method name="TResult Invoke(T1)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T1, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="TResult EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
     <type name="ExtensionTest.MyClass">
-      <method name="Boolean IsCharacters(System.String, System.Char[])" attrs="150">
-        <size>27</size>
-      </method>
-      <method name="Boolean Contains(System.String, System.String, StringComparison)" attrs="150">
-        <size>23</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
@@ -22272,16 +22547,26 @@
         <size>10</size>
       </method>
     </type>
-  </test>
-  <test name="gtest-exmethod-47.cs">
-    <type name="D">
-      <method name="Void Invoke()" attrs="454">
+    <type name="ExtensionTest.Two.AxFunc`2[T1,TResult]">
+      <method name="System.IAsyncResult BeginInvoke(T1, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="TResult EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="ExtensionTest.MyClass">
+      <method name="Boolean IsCharacters(System.String, Char[])" attrs="150">
+        <size>27</size>
+      </method>
+      <method name="Boolean Contains(System.String, System.String, System.StringComparison)" attrs="150">
+        <size>23</size>
+      </method>
+    </type>
+  </test>
+  <test name="gtest-exmethod-47.cs">
+    <type name="D">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -22309,6 +22594,14 @@
         <size>2</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-fixedbuffer-01.cs">
     <type name="TestNew">
@@ -22379,12 +22672,12 @@
       <method name="Boolean Fixed()" attrs="129">
         <size>23</size>
       </method>
-      <method name="Boolean Foo(System.Int32[])" attrs="145">
-        <size>52</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>88</size>
       </method>
+      <method name="Boolean Foo(Int32[])" attrs="145">
+        <size>52</size>
+      </method>
     </type>
   </test>
   <test name="gtest-fixedbuffer-07.cs">
@@ -22993,9 +23286,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>204</size>
       </method>
@@ -23016,9 +23306,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>232</size>
       </method>
@@ -23050,6 +23337,16 @@
         <size>52</size>
       </method>
     </type>
+    <type name="Test+&lt;Annotations&gt;c__Iterator0`1[T]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="Test+&lt;Annotations&gt;c__Iterator1">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-iter-04.cs">
     <type name="TestClass">
@@ -23078,9 +23375,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>38</size>
       </method>
@@ -23103,6 +23397,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Object] System.Collections.Generic.IEnumerable&lt;object&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-05.cs">
@@ -23129,9 +23426,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>197</size>
       </method>
@@ -23154,6 +23448,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[T] System.Collections.Generic.IEnumerable&lt;T&gt;.GetEnumerator()" attrs="481">
         <size>52</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-06.cs">
@@ -23172,9 +23469,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>192</size>
       </method>
@@ -23210,6 +23504,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[TResult] System.Collections.Generic.IEnumerable&lt;TResult&gt;.GetEnumerator()" attrs="481">
         <size>52</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-07.cs">
@@ -23233,9 +23530,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>197</size>
       </method>
@@ -23263,6 +23557,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.String] System.Collections.Generic.IEnumerable&lt;string&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-08.cs">
@@ -23270,9 +23567,6 @@
       <method name="Int32 Main()" attrs="150">
         <size>137</size>
       </method>
-      <method name="IEnumerable QueryEnumerable[T]()" attrs="150">
-        <size>23</size>
-      </method>
       <method name="T TestType[T]()" attrs="150">
         <size>29</size>
       </method>
@@ -23290,9 +23584,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>91</size>
       </method>
@@ -23309,6 +23600,16 @@
         <size>26</size>
       </method>
     </type>
+    <type name="App">
+      <method name="System.Collections.IEnumerable QueryEnumerable[T]()" attrs="150">
+        <size>23</size>
+      </method>
+    </type>
+    <type name="App+&lt;QueryEnumerable&gt;c__Iterator0`1[T]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-iter-09.cs">
     <type name="Test">
@@ -23326,9 +23627,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>137</size>
       </method>
@@ -23351,6 +23649,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[T] System.Collections.Generic.IEnumerable&lt;T&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-10.cs">
@@ -23369,9 +23670,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>110</size>
       </method>
@@ -23394,6 +23692,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>52</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-11.cs">
@@ -23414,9 +23715,6 @@
       </method>
     </type>
     <type name="Collection`1[T]">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>15</size>
-      </method>
       <method name="Void Add(T)" attrs="134">
         <size>14</size>
       </method>
@@ -23461,6 +23759,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[T] GetEnumerator()" attrs="486">
         <size>22</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>15</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-12.cs">
@@ -23479,9 +23780,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>124</size>
       </method>
@@ -23504,13 +23802,13 @@
       <method name="System.Collections.Generic.IEnumerator`1[T] System.Collections.Generic.IEnumerable&lt;T&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-13.cs">
     <type name="C`1[T]">
-      <method name="IEnumerator GetEnumerator()" attrs="134">
-        <size>20</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -23530,9 +23828,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>225</size>
       </method>
@@ -23556,6 +23851,16 @@
         <size>52</size>
       </method>
     </type>
+    <type name="C`1[T]">
+      <method name="System.Collections.IEnumerator GetEnumerator()" attrs="134">
+        <size>20</size>
+      </method>
+    </type>
+    <type name="C`1+&lt;Filter&gt;c__Iterator0[T]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-iter-14.cs">
     <type name="A">
@@ -23606,9 +23911,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>82</size>
       </method>
@@ -23653,9 +23955,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
@@ -23663,6 +23962,16 @@
         <size>7</size>
       </method>
     </type>
+    <type name="S+&lt;GetIt&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="X+&lt;GetIt&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-iter-15.cs">
     <type name="C`1[TFirst]">
@@ -23690,9 +23999,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>189</size>
       </method>
@@ -23715,6 +24021,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[V] System.Collections.Generic.IEnumerable&lt;V&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-16.cs">
@@ -23743,9 +24052,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>77</size>
       </method>
@@ -23801,9 +24107,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[Test.Base] System.Collections.Generic.IEnumerable&lt;Test.Base&gt;.GetEnumerator()" attrs="481">
         <size>52</size>
       </method>
@@ -23827,9 +24130,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[Test.Base] System.Collections.Generic.IEnumerable&lt;Test.Base&gt;.GetEnumerator()" attrs="481">
         <size>52</size>
       </method>
@@ -23837,6 +24137,21 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test.Base+&lt;GetStuff&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="Test.Derived+&lt;GetStuff&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="Test.SpecialDerived+&lt;GetStuff&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-iter-17.cs">
     <type name="Test">
@@ -23854,9 +24169,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>37</size>
       </method>
@@ -23879,6 +24191,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-18.cs">
@@ -23897,9 +24212,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>78</size>
       </method>
@@ -23922,13 +24234,13 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Char] System.Collections.Generic.IEnumerable&lt;char&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-19.cs">
     <type name="IEnumerableTransform">
-      <method name="IEnumerableTransform+EmitterFunc`1[TOut] Emit[TOut](TOut)" attrs="150">
-        <size>34</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>64</size>
       </method>
@@ -23937,12 +24249,6 @@
       <method name="Void Invoke(TOut ByRef)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(TOut ByRef, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(TOut ByRef, IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -23954,9 +24260,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>203</size>
       </method>
@@ -23978,14 +24281,30 @@
         <size>7</size>
       </method>
     </type>
+    <type name="IEnumerableTransform+&lt;Transform&gt;c__Iterator0`1[TOut]">
+      <method name="System.Collections.Generic.IEnumerator`1[TOut] System.Collections.Generic.IEnumerable&lt;TOut&gt;.GetEnumerator()" attrs="481">
+        <size>52</size>
+      </method>
+    </type>
     <type name="IEnumerableTransform">
-      <method name="System.Collections.Generic.IEnumerable`1[TOut] Transform[TOut](System.Collections.Generic.IEnumerable`1[System.Int32], IEnumerableTransform+EmitterFunc`1[TOut])" attrs="150">
+      <method name="System.Collections.Generic.IEnumerable`1[TOut] Transform[TOut](System.Collections.Generic.IEnumerable`1[System.Int32], EmitterFunc`1)" attrs="150">
         <size>37</size>
       </method>
+      <method name="EmitterFunc`1 Emit[TOut](TOut)" attrs="150">
+        <size>34</size>
+      </method>
+    </type>
+    <type name="IEnumerableTransform+EmitterFunc`1[TOut]">
+      <method name="System.IAsyncResult BeginInvoke(TOut ByRef, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(TOut ByRef, System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
     </type>
     <type name="IEnumerableTransform+&lt;Transform&gt;c__Iterator0`1[TOut]">
-      <method name="System.Collections.Generic.IEnumerator`1[TOut] System.Collections.Generic.IEnumerable&lt;TOut&gt;.GetEnumerator()" attrs="481">
-        <size>52</size>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
       </method>
     </type>
   </test>
@@ -23994,9 +24313,6 @@
       <method name="Int32 Main()" attrs="150">
         <size>72</size>
       </method>
-      <method name="IEnumerable GetAll()" attrs="145">
-        <size>23</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -24008,9 +24324,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>77</size>
       </method>
@@ -24027,6 +24340,16 @@
         <size>26</size>
       </method>
     </type>
+    <type name="X">
+      <method name="System.Collections.IEnumerable GetAll()" attrs="145">
+        <size>23</size>
+      </method>
+    </type>
+    <type name="X+&lt;GetAll&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-iter-21.cs">
     <type name="C">
@@ -24044,9 +24367,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Void &lt;&gt;__Finally0()" attrs="129">
         <size>29</size>
       </method>
@@ -24080,6 +24400,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-22.cs">
@@ -24106,9 +24429,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>74</size>
       </method>
@@ -24131,6 +24451,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-23.cs">
@@ -24149,9 +24472,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>271</size>
       </method>
@@ -24172,9 +24492,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>200</size>
       </method>
@@ -24224,6 +24541,16 @@
         <size>14</size>
       </method>
     </type>
+    <type name="C+&lt;Test&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="C+&lt;Test_2&gt;c__Iterator1">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-iter-24.cs">
     <type name="B">
@@ -24252,9 +24579,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>170</size>
       </method>
@@ -24288,6 +24612,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-25.cs">
@@ -24303,9 +24630,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>143</size>
       </method>
@@ -24331,6 +24655,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Object] System.Collections.Generic.IEnumerable&lt;object&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-26.cs">
@@ -24346,9 +24673,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>72</size>
       </method>
@@ -24371,6 +24695,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Object] System.Collections.Generic.IEnumerable&lt;object&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-27.cs">
@@ -24389,9 +24716,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>161</size>
       </method>
@@ -24417,6 +24741,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.String] System.Collections.Generic.IEnumerable&lt;string&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-28.cs">
@@ -24445,9 +24772,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>178</size>
       </method>
@@ -24483,6 +24807,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.String] System.Collections.Generic.IEnumerable&lt;string&gt;.GetEnumerator()" attrs="481">
         <size>52</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-29.cs">
@@ -24510,9 +24837,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -24526,6 +24850,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-30.cs">
@@ -24561,9 +24888,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
@@ -24582,6 +24906,11 @@
         <size>24</size>
       </method>
     </type>
+    <type name="M+&lt;Test&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-iter-31.cs">
     <type name="B">
@@ -24619,9 +24948,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[System.UInt16] System.Collections.Generic.IEnumerable&lt;ushort&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
@@ -24631,6 +24957,9 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-iter-32.cs">
@@ -24667,9 +24996,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[System.Boolean] System.Collections.Generic.IEnumerable&lt;bool&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
@@ -24696,9 +25022,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[System.Boolean] System.Collections.Generic.IEnumerable&lt;bool&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
@@ -24706,18 +25029,22 @@
         <size>7</size>
       </method>
     </type>
+    <type name="TestGoto+&lt;setX&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="TestGoto+&lt;test&gt;c__Iterator1">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-iter-33.cs">
     <type name="Fun`2[A1,R]">
       <method name="R Invoke(A1)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(A1, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="R EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -24755,9 +25082,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[Rr] System.Collections.Generic.IEnumerable&lt;Rr&gt;.GetEnumerator()" attrs="481">
         <size>52</size>
       </method>
@@ -24781,9 +25105,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>52</size>
       </method>
@@ -24791,16 +25112,28 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="gtest-lambda-01.cs">
-    <type name="IntFunc">
-      <method name="Int32 Invoke(Int32)" attrs="454">
+    <type name="Fun`2[A1,R]">
+      <method name="System.IAsyncResult BeginInvoke(A1, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="R EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="MyTest+&lt;Map&gt;c__Iterator0`4[Aa,Af,Rf,Rr]">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="MyTest+&lt;FromTo&gt;c__Iterator1">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+  </test>
+  <test name="gtest-lambda-01.cs">
+    <type name="IntFunc">
+      <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -24811,12 +25144,6 @@
       <method name="Void Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -24850,30 +25177,34 @@
         <size>9</size>
       </method>
     </type>
-  </test>
-  <test name="gtest-lambda-02.cs">
-    <type name="funcs">
-      <method name="System.String Invoke(System.String)" attrs="454">
+    <type name="IntFunc">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="System.String EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="VoidFunc">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="funci">
-      <method name="Int32 Invoke(Int32)" attrs="454">
+  </test>
+  <test name="gtest-lambda-02.cs">
+    <type name="funcs">
+      <method name="System.String Invoke(System.String)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="funci">
+      <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -24897,16 +25228,26 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="gtest-lambda-03.cs">
-    <type name="Func`2[TArg0,TResult]">
-      <method name="TResult Invoke(TArg0)" attrs="454">
+    <type name="funcs">
+      <method name="System.IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.String EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="funci">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(TArg0, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="TResult EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="gtest-lambda-03.cs">
+    <type name="Func`2[TArg0,TResult]">
+      <method name="TResult Invoke(TArg0)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -24920,23 +25261,27 @@
       <method name="Int32 Main()" attrs="150">
         <size>62</size>
       </method>
-      <method name="TimeSpan &lt;Main&gt;m__0(System.String)" attrs="145">
-        <size>14</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="gtest-lambda-04.cs">
     <type name="Func`2[TArg0,TResult]">
-      <method name="TResult Invoke(TArg0)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(TArg0, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(TArg0, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="TResult EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="TResult EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Demo">
+      <method name="System.TimeSpan &lt;Main&gt;m__0(System.String)" attrs="145">
+        <size>14</size>
+      </method>
+    </type>
+  </test>
+  <test name="gtest-lambda-04.cs">
+    <type name="Func`2[TArg0,TResult]">
+      <method name="TResult Invoke(TArg0)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -24950,28 +25295,29 @@
       <method name="Int32 Main()" attrs="150">
         <size>116</size>
       </method>
-      <method name="TimeSpan &lt;Main&gt;m__0(System.String)" attrs="145">
-        <size>14</size>
-      </method>
-      <method name="Double &lt;Main&gt;m__1(TimeSpan)" attrs="145">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="gtest-lambda-05.cs">
-    <type name="C">
-      <method name="Boolean M(C+db)" attrs="145">
-        <size>16</size>
+    <type name="Func`2[TArg0,TResult]">
+      <method name="System.IAsyncResult BeginInvoke(TArg0, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
       </method>
-      <method name="System.String M(C+ds)" attrs="145">
+      <method name="TResult EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="Demo">
+      <method name="System.TimeSpan &lt;Main&gt;m__0(System.String)" attrs="145">
         <size>14</size>
       </method>
-      <method name="Int32 M(C+di)" attrs="145">
-        <size>16</size>
+      <method name="Double &lt;Main&gt;m__1(System.TimeSpan)" attrs="145">
+        <size>15</size>
       </method>
+    </type>
+  </test>
+  <test name="gtest-lambda-05.cs">
+    <type name="C">
       <method name="Int32 Main()" attrs="150">
         <size>147</size>
       </method>
@@ -24989,12 +25335,6 @@
       <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -25003,12 +25343,6 @@
       <method name="System.String Invoke(System.String)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="System.String EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -25017,12 +25351,6 @@
       <method name="Boolean Invoke(Boolean)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Boolean, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Boolean EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -25047,15 +25375,44 @@
         <size>18</size>
       </method>
     </type>
+    <type name="C">
+      <method name="Boolean M(db)" attrs="145">
+        <size>16</size>
+      </method>
+      <method name="System.String M(ds)" attrs="145">
+        <size>14</size>
+      </method>
+      <method name="Int32 M(di)" attrs="145">
+        <size>16</size>
+      </method>
+    </type>
+    <type name="C+di">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="C+ds">
+      <method name="System.IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.String EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="C+db">
+      <method name="System.IAsyncResult BeginInvoke(Boolean, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Boolean EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-lambda-06.cs">
     <type name="TestClass">
-      <method name="Void P(TestClass+DT)" attrs="145">
-        <size>27</size>
-      </method>
-      <method name="Void P(TestClass+DF)" attrs="145">
-        <size>27</size>
-      </method>
       <method name="T And(T, T)" attrs="145">
         <size>18</size>
       </method>
@@ -25103,12 +25460,6 @@
       <method name="Void Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -25117,12 +25468,6 @@
       <method name="Void Invoke(F)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(F, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -25147,30 +25492,42 @@
         <size>77</size>
       </method>
     </type>
-  </test>
-  <test name="gtest-lambda-07.cs">
-    <type name="D">
-      <method name="Void Invoke()" attrs="454">
+    <type name="TestClass">
+      <method name="Void P(DT)" attrs="145">
+        <size>27</size>
+      </method>
+      <method name="Void P(DF)" attrs="145">
+        <size>27</size>
+      </method>
+    </type>
+    <type name="TestClass+DT">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="TestClass+DF">
+      <method name="System.IAsyncResult BeginInvoke(F, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="E">
-      <method name="Void Invoke(Boolean)" attrs="454">
+  </test>
+  <test name="gtest-lambda-07.cs">
+    <type name="D">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Boolean, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="E">
+      <method name="Void Invoke(Boolean)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -25215,6 +25572,22 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="E">
+      <method name="System.IAsyncResult BeginInvoke(Boolean, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-lambda-08.cs">
     <type name="C">
@@ -25255,12 +25628,6 @@
       <method name="TD Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="TD EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -25269,12 +25636,6 @@
       <method name="TR Invoke(TA)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(TA, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="TR EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -25305,6 +25666,22 @@
         <size>10</size>
       </method>
     </type>
+    <type name="Func`1[TD]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="TD EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="Func`2[TA,TR]">
+      <method name="System.IAsyncResult BeginInvoke(TA, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="TR EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-lambda-10.cs">
     <type name="C">
@@ -25338,10 +25715,10 @@
       <method name="System.Collections.Generic.IEnumerable`1[System.Int32] &lt;&gt;m__0(Int32)" attrs="131">
         <size>15</size>
       </method>
-      <method name="System.Collections.Generic.IEnumerable`1[System.Int32] &lt;&gt;m__1(Int32, System.Int32[])" attrs="131">
+      <method name="System.Collections.Generic.IEnumerable`1[System.Int32] &lt;&gt;m__1(Int32, Int32[])" attrs="131">
         <size>15</size>
       </method>
-      <method name="System.Collections.Generic.IEnumerable`1[System.Int32] &lt;&gt;m__2(System.Int32[])" attrs="131">
+      <method name="System.Collections.Generic.IEnumerable`1[System.Int32] &lt;&gt;m__2(Int32[])" attrs="131">
         <size>15</size>
       </method>
     </type>
@@ -25356,12 +25733,6 @@
       <method name="Pair`2[T1,T2] Invoke(T1)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T1, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Pair`2[T1,T2] EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -25395,16 +25766,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="gtest-lambda-12.cs">
-    <type name="Func`1[TA]">
-      <method name="Void Invoke(TA)" attrs="454">
+    <type name="Group`2[T1,T2]">
+      <method name="System.IAsyncResult BeginInvoke(T1, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(TA, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Pair`2[T1,T2] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="gtest-lambda-12.cs">
+    <type name="Func`1[TA]">
+      <method name="Void Invoke(TA)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -25430,6 +25803,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Func`1[TA]">
+      <method name="System.IAsyncResult BeginInvoke(TA, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-lambda-13.cs">
     <type name="TestUnary">
@@ -25633,13 +26014,13 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -25726,7 +26107,7 @@
       <method name="Boolean &lt;&gt;m__0(Product)" attrs="131">
         <size>60</size>
       </method>
-      <method name="Decimal &lt;&gt;m__1(Product)" attrs="145">
+      <method name="System.Decimal &lt;&gt;m__1(Product)" attrs="145">
         <size>14</size>
       </method>
     </type>
@@ -25882,9 +26263,6 @@
       <method name="Void M3[T](System.Action`1[C`1[T[]][]])" attrs="145">
         <size>2</size>
       </method>
-      <method name="Void &lt;Main&gt;m__0(System.Int32[][])" attrs="145">
-        <size>2</size>
-      </method>
       <method name="Void &lt;Main&gt;m__1(C`1[System.Int16][])" attrs="145">
         <size>2</size>
       </method>
@@ -25894,6 +26272,9 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Void &lt;Main&gt;m__0(Int32[][])" attrs="145">
+        <size>2</size>
+      </method>
     </type>
   </test>
   <test name="gtest-lambda-30.cs">
@@ -25931,7 +26312,17 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
-      <method name="System.Collections.Generic.IEnumerable`1[System.Int32] &lt;Main&gt;m__0(IEnumerable)" attrs="145">
+    </type>
+  </test>
+  <test name="gtest-lambda-32.cs">
+    <type name="X">
+      <method name="Void Main()" attrs="145">
+        <size>34</size>
+      </method>
+      <method name="Byte &lt;Main&gt;m__0()" attrs="145">
+        <size>13</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
     </type>
@@ -26153,39 +26544,15 @@
       <method name="Int32 &lt;Main&gt;m__6(Int32)" attrs="145">
         <size>10</size>
       </method>
-      <method name="Int32 &lt;Main&gt;m__E(ITest)" attrs="145">
-        <size>15</size>
-      </method>
-      <method name="Int32 &lt;Main&gt;m__F(Int32, ITest)" attrs="145">
-        <size>10</size>
-      </method>
       <method name="Int32 &lt;Main&gt;m__10(Int32)" attrs="145">
         <size>10</size>
       </method>
-      <method name="Int32 &lt;Main&gt;m__11(ITest)" attrs="145">
-        <size>15</size>
-      </method>
-      <method name="Int32 &lt;Main&gt;m__12(Int32, ITest)" attrs="145">
-        <size>10</size>
-      </method>
       <method name="Int32 &lt;Main&gt;m__13(Int32)" attrs="145">
         <size>10</size>
       </method>
-      <method name="Int32 &lt;Main&gt;m__14(ITest)" attrs="145">
-        <size>15</size>
-      </method>
-      <method name="&lt;&gt;__AnonType0`2[System.Int32,from.ITest] &lt;Main&gt;m__15(Int32, ITest)" attrs="145">
-        <size>16</size>
-      </method>
       <method name="Int32 &lt;Main&gt;m__16(&lt;&gt;__AnonType0`2[System.Int32,from.ITest])" attrs="145">
         <size>15</size>
       </method>
-      <method name="Int32 &lt;Main&gt;m__17(ITest)" attrs="145">
-        <size>15</size>
-      </method>
-      <method name="Int32 &lt;Main&gt;m__18(&lt;&gt;__AnonType0`2[System.Int32,from.ITest], ITest)" attrs="145">
-        <size>15</size>
-      </method>
       <method name="Int32 &lt;Main&gt;m__19(Int32)" attrs="145">
         <size>10</size>
       </method>
@@ -26276,6 +26643,32 @@
         <size>10</size>
       </method>
     </type>
+    <type name="from.C">
+      <method name="Int32 &lt;Main&gt;m__E(from.ITest)" attrs="145">
+        <size>15</size>
+      </method>
+      <method name="Int32 &lt;Main&gt;m__F(Int32, from.ITest)" attrs="145">
+        <size>10</size>
+      </method>
+      <method name="Int32 &lt;Main&gt;m__11(from.ITest)" attrs="145">
+        <size>15</size>
+      </method>
+      <method name="Int32 &lt;Main&gt;m__12(Int32, from.ITest)" attrs="145">
+        <size>10</size>
+      </method>
+      <method name="Int32 &lt;Main&gt;m__14(from.ITest)" attrs="145">
+        <size>15</size>
+      </method>
+      <method name="&lt;&gt;__AnonType0`2[System.Int32,from.ITest] &lt;Main&gt;m__15(Int32, from.ITest)" attrs="145">
+        <size>16</size>
+      </method>
+      <method name="Int32 &lt;Main&gt;m__17(from.ITest)" attrs="145">
+        <size>15</size>
+      </method>
+      <method name="Int32 &lt;Main&gt;m__18(&lt;&gt;__AnonType0`2[System.Int32,from.ITest], from.ITest)" attrs="145">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-linq-02.cs">
     <type name="Test">
@@ -26363,39 +26756,6 @@
       <method name="Int32 &lt;Main&gt;m__5(System.String)" attrs="145">
         <size>15</size>
       </method>
-      <method name="Int32 &lt;Main&gt;m__6(OrderByTests+Data)" attrs="145">
-        <size>15</size>
-      </method>
-      <method name="System.String &lt;Main&gt;m__7(OrderByTests+Data)" attrs="145">
-        <size>15</size>
-      </method>
-      <method name="Int32 &lt;Main&gt;m__8(OrderByTests+Data)" attrs="145">
-        <size>15</size>
-      </method>
-      <method name="System.String &lt;Main&gt;m__9(OrderByTests+Data)" attrs="145">
-        <size>15</size>
-      </method>
-      <method name="Boolean &lt;Main&gt;m__A(OrderByTests+Data)" attrs="145">
-        <size>19</size>
-      </method>
-      <method name="Int32 &lt;Main&gt;m__B(OrderByTests+Data)" attrs="145">
-        <size>15</size>
-      </method>
-      <method name="System.String &lt;Main&gt;m__C(OrderByTests+Data)" attrs="145">
-        <size>15</size>
-      </method>
-      <method name="Boolean &lt;Main&gt;m__D(OrderByTests+Data)" attrs="145">
-        <size>19</size>
-      </method>
-      <method name="System.String &lt;Main&gt;m__E(OrderByTests+Data)" attrs="145">
-        <size>15</size>
-      </method>
-      <method name="System.String &lt;Main&gt;m__F(OrderByTests+Data)" attrs="145">
-        <size>15</size>
-      </method>
-      <method name="OrderByTests+Data &lt;Main&gt;m__10(OrderByTests+Data)" attrs="145">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -26420,6 +26780,41 @@
         <size>7</size>
       </method>
     </type>
+    <type name="OrderByTests">
+      <method name="Int32 &lt;Main&gt;m__6(Data)" attrs="145">
+        <size>15</size>
+      </method>
+      <method name="System.String &lt;Main&gt;m__7(Data)" attrs="145">
+        <size>15</size>
+      </method>
+      <method name="Int32 &lt;Main&gt;m__8(Data)" attrs="145">
+        <size>15</size>
+      </method>
+      <method name="System.String &lt;Main&gt;m__9(Data)" attrs="145">
+        <size>15</size>
+      </method>
+      <method name="Boolean &lt;Main&gt;m__A(Data)" attrs="145">
+        <size>19</size>
+      </method>
+      <method name="Int32 &lt;Main&gt;m__B(Data)" attrs="145">
+        <size>15</size>
+      </method>
+      <method name="System.String &lt;Main&gt;m__C(Data)" attrs="145">
+        <size>15</size>
+      </method>
+      <method name="Boolean &lt;Main&gt;m__D(Data)" attrs="145">
+        <size>19</size>
+      </method>
+      <method name="System.String &lt;Main&gt;m__E(Data)" attrs="145">
+        <size>15</size>
+      </method>
+      <method name="System.String &lt;Main&gt;m__F(Data)" attrs="145">
+        <size>15</size>
+      </method>
+      <method name="Data &lt;Main&gt;m__10(Data)" attrs="145">
+        <size>10</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-linq-06.cs">
     <type name="Let">
@@ -27079,9 +27474,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>93</size>
       </method>
@@ -27104,6 +27496,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[TR] System.Collections.Generic.IEnumerable&lt;TR&gt;.GetEnumerator()" attrs="481">
         <size>52</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="gtest-linq-16.cs">
@@ -27594,12 +27989,12 @@
       <method name="&lt;&gt;__AnonType0`2[System.Char,System.Boolean] &lt;&gt;m__0(Char)" attrs="131">
         <size>31</size>
       </method>
-      <method name="DateTime &lt;&gt;m__1(&lt;&gt;__AnonType0`2[System.Char,System.Boolean])" attrs="131">
-        <size>36</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="System.DateTime &lt;&gt;m__1(&lt;&gt;__AnonType0`2[System.Char,System.Boolean])" attrs="131">
+        <size>36</size>
+      </method>
     </type>
   </test>
   <test name="gtest-linq-23.cs">
@@ -27971,15 +28366,15 @@
       <method name="Void TestB(Int64)" attrs="150">
         <size>2</size>
       </method>
-      <method name="Void TestC(Decimal)" attrs="150">
-        <size>2</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>378</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Void TestC(System.Decimal)" attrs="150">
+        <size>2</size>
+      </method>
     </type>
   </test>
   <test name="gtest-optional-02.cs">
@@ -28022,9 +28417,6 @@
       <method name="Void Foo[T](T, T)" attrs="145">
         <size>2</size>
       </method>
-      <method name="Void TestParams(System.Int32[])" attrs="145">
-        <size>7</size>
-      </method>
       <method name="Void TestParams(Int32)" attrs="145">
         <size>2</size>
       </method>
@@ -28046,6 +28438,9 @@
       <method name="Void TestStruct2(System.Nullable`1[S])" attrs="145">
         <size>2</size>
       </method>
+      <method name="Void TestParams(Int32[])" attrs="145">
+        <size>7</size>
+      </method>
     </type>
   </test>
   <test name="gtest-optional-05.cs">
@@ -28064,13 +28459,13 @@
       <method name="Int32 Invoke(Int32, Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(Int32, Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -28080,12 +28475,6 @@
       <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -28101,6 +28490,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-optional-07.cs">
     <type name="Tests">
@@ -28227,15 +28624,15 @@
   </test>
   <test name="gtest-optional-12.cs">
     <type name="C">
-      <method name="Int32 M(System.String, Int32, System.Int32[])" attrs="145">
-        <size>12</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>54</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Int32 M(System.String, Int32, Int32[])" attrs="145">
+        <size>12</size>
+      </method>
     </type>
   </test>
   <test name="gtest-optional-13.cs">
@@ -28346,15 +28743,15 @@
   </test>
   <test name="gtest-optional-18.cs">
     <type name="C">
-      <method name="Void Test(Decimal)" attrs="145">
-        <size>2</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>21</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Void Test(System.Decimal)" attrs="145">
+        <size>2</size>
+      </method>
     </type>
   </test>
   <test name="gtest-optional-19.cs">
@@ -28445,9 +28842,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>88</size>
       </method>
@@ -28504,12 +28898,14 @@
         <size>24</size>
       </method>
     </type>
+    <type name="CallerMemberTest+&lt;Enumerator&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-optional-23.cs">
     <type name="CallerLineNumberTest">
-      <method name="Void TraceStatic2(Double, Decimal)" attrs="145">
-        <size>2</size>
-      </method>
       <method name="System.Object TraceStatic(Int32, Int32)" attrs="150">
         <size>56</size>
       </method>
@@ -28525,6 +28921,9 @@
       <method name="Void .ctor(Object)" attrs="6273">
         <size>21</size>
       </method>
+      <method name="Void TraceStatic2(Double, System.Decimal)" attrs="145">
+        <size>2</size>
+      </method>
     </type>
   </test>
   <test name="gtest-optional-24.cs">
@@ -28586,7 +28985,7 @@
       </method>
     </type>
     <type name="EnumWrapperCtor`1[T]">
-      <method name="EnumWrapperCtor`1+Test[T] getValue()" attrs="134">
+      <method name="Test getValue()" attrs="134">
         <size>15</size>
       </method>
     </type>
@@ -28913,12 +29312,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -28940,6 +29333,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-variance-13.cs">
     <type name="A">
@@ -29000,39 +29401,37 @@
       <method name="Void Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="C+D`2[T,U]">
+      <method name="T Invoke(U)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
-    <type name="C+D`2[T,U]">
-      <method name="T Invoke(U)" attrs="454">
+    <type name="C+D`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(U, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="T EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="C+D`2[T,U]">
+      <method name="System.IAsyncResult BeginInvoke(U, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="T EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
   </test>
   <test name="gtest-variance-15.cs">
     <type name="C">
-      <method name="Void M[T](T ByRef, C+D`1[T])" attrs="145">
-        <size>14</size>
-      </method>
-      <method name="Void M2[T](T, C+D`1[T])" attrs="145">
-        <size>9</size>
-      </method>
       <method name="Void MethodArg(System.Object)" attrs="145">
         <size>2</size>
       </method>
@@ -29050,13 +29449,23 @@
       <method name="Void Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="C">
+      <method name="Void M[T](T ByRef, D`1)" attrs="145">
+        <size>14</size>
+      </method>
+      <method name="Void M2[T](T, D`1)" attrs="145">
+        <size>9</size>
+      </method>
+    </type>
+    <type name="C+D`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -29152,12 +29561,6 @@
       <method name="TR Invoke(T1)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T1, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="TR EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -29170,6 +29573,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Func`2[T1,TR]">
+      <method name="System.IAsyncResult BeginInvoke(T1, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="TR EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-variance-21.cs">
     <type name="C">
@@ -29189,12 +29600,6 @@
       <method name="T Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="T EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -29218,16 +29623,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="gtest-variance-4.cs">
     <type name="Foo`1[T]">
-      <method name="Int32 Invoke(T)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="T EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="gtest-variance-4.cs">
+    <type name="Foo`1[T]">
+      <method name="Int32 Invoke(T)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -29248,6 +29655,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Foo`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="gtest-variance-5.cs">
     <type name="BothVariants`2[T1,T2]">
@@ -29325,17 +29740,11 @@
       </method>
     </type>
     <type name="Cov4`1[U]">
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
     <type name="Cov5`1[U]">
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -29346,9 +29755,6 @@
       </method>
     </type>
     <type name="Contra6`1[U]">
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -29375,89 +29781,116 @@
       <method name="ICovariant`1[U] Invoke(IContravariant`1[U])" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(IContravariant`1[U], System.AsyncCallback, System.Object)" attrs="454">
+    </type>
+    <type name="Cov2`1[U]">
+      <method name="ICovariant`1[U] Invoke(IContravariant`1[ICovariant`1[U]])" attrs="454">
         <size>0</size>
       </method>
-      <method name="ICovariant`1[U] EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Cov3`1[U]">
+      <method name="ICovariant`1[IContravariant`1[IContravariant`1[U]]] Invoke(IContravariant`1[IContravariant`1[IContravariant`1[ICovariant`1[U]]]])" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Cov2`1[U]">
-      <method name="ICovariant`1[U] Invoke(IContravariant`1[ICovariant`1[U]])" attrs="454">
+    <type name="Cov4`1[U]">
+      <method name="ICovariant`1[System.Int32] Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(IContravariant`1[ICovariant`1[U]], System.AsyncCallback, System.Object)" attrs="454">
+    </type>
+    <type name="Cov5`1[U]">
+      <method name="IContravariant`1[System.Int32] Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="ICovariant`1[U] EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Contra5`1[U]">
+      <method name="IContravariant`1[U[]] Invoke(U, ICovariant`1[U])" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Cov3`1[U]">
-      <method name="ICovariant`1[IContravariant`1[IContravariant`1[U]]] Invoke(IContravariant`1[IContravariant`1[IContravariant`1[ICovariant`1[U]]]])" attrs="454">
+    <type name="Contra6`1[U]">
+      <method name="IContravariant`1[U[]] Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(IContravariant`1[IContravariant`1[IContravariant`1[ICovariant`1[U]]]], System.AsyncCallback, System.Object)" attrs="454">
+    </type>
+    <type name="Contra7`1[U]">
+      <method name="IContravariant`1[U] Invoke(U, ICovariant`1[U])" attrs="454">
         <size>0</size>
       </method>
-      <method name="ICovariant`1[IContravariant`1[IContravariant`1[U]]] EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Contra8`1[U]">
+      <method name="IContravariant`1[ICovariant`1[U]] Invoke(U, ICovariant`1[U])" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Cov4`1[U]">
-      <method name="ICovariant`1[System.Int32] Invoke()" attrs="454">
+    <type name="Cov1`1[U]">
+      <method name="System.IAsyncResult BeginInvoke(IContravariant`1[U], System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="ICovariant`1[System.Int32] EndInvoke(IAsyncResult)" attrs="454">
+      <method name="ICovariant`1[U] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Cov5`1[U]">
-      <method name="IContravariant`1[System.Int32] Invoke()" attrs="454">
+    <type name="Cov2`1[U]">
+      <method name="System.IAsyncResult BeginInvoke(IContravariant`1[ICovariant`1[U]], System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IContravariant`1[System.Int32] EndInvoke(IAsyncResult)" attrs="454">
+      <method name="ICovariant`1[U] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Contra5`1[U]">
-      <method name="IContravariant`1[U[]] Invoke(U, ICovariant`1[U])" attrs="454">
+    <type name="Cov3`1[U]">
+      <method name="System.IAsyncResult BeginInvoke(IContravariant`1[IContravariant`1[IContravariant`1[ICovariant`1[U]]]], System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="ICovariant`1[IContravariant`1[IContravariant`1[U]]] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(U, ICovariant`1[U], System.AsyncCallback, System.Object)" attrs="454">
+    </type>
+    <type name="Cov4`1[U]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IContravariant`1[U[]] EndInvoke(IAsyncResult)" attrs="454">
+      <method name="ICovariant`1[System.Int32] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Contra6`1[U]">
-      <method name="IContravariant`1[U[]] Invoke()" attrs="454">
+    <type name="Cov5`1[U]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IContravariant`1[U[]] EndInvoke(IAsyncResult)" attrs="454">
+      <method name="IContravariant`1[System.Int32] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Contra7`1[U]">
-      <method name="IContravariant`1[U] Invoke(U, ICovariant`1[U])" attrs="454">
+    <type name="Contra5`1[U]">
+      <method name="System.IAsyncResult BeginInvoke(U, ICovariant`1[U], System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="IContravariant`1[U[]] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(U, ICovariant`1[U], System.AsyncCallback, System.Object)" attrs="454">
+    </type>
+    <type name="Contra6`1[U]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IContravariant`1[U] EndInvoke(IAsyncResult)" attrs="454">
+      <method name="IContravariant`1[U[]] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Contra8`1[U]">
-      <method name="IContravariant`1[ICovariant`1[U]] Invoke(U, ICovariant`1[U])" attrs="454">
+    <type name="Contra7`1[U]">
+      <method name="System.IAsyncResult BeginInvoke(U, ICovariant`1[U], System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="IContravariant`1[U] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(U, ICovariant`1[U], System.AsyncCallback, System.Object)" attrs="454">
+    </type>
+    <type name="Contra8`1[U]">
+      <method name="System.IAsyncResult BeginInvoke(U, ICovariant`1[U], System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IContravariant`1[ICovariant`1[U]] EndInvoke(IAsyncResult)" attrs="454">
+      <method name="IContravariant`1[ICovariant`1[U]] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -29467,12 +29900,6 @@
       <method name="T Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="T EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -29481,204 +29908,240 @@
       <method name="Void Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="CoContra`2[TR,T]">
+      <method name="TR Invoke(T)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
-    <type name="CoContra`2[TR,T]">
-      <method name="TR Invoke(T)" attrs="454">
+    <type name="None`1[T]">
+      <method name="Void Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="TR EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test`1[U]">
+      <method name="Covariant`1[Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[U]]]]]]]] Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
-    <type name="None`1[T]">
-      <method name="Void Invoke(T)" attrs="454">
+    <type name="Test2`1[U]">
+      <method name="Contra`1[Covariant`1[Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[U]]]]]]]]] Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test3`1[U]">
+      <method name="Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Contra`1[Contra`1[U]]]]]]]] Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
-    <type name="Test`1[U]">
-      <method name="Covariant`1[Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[U]]]]]]]] Invoke()" attrs="454">
+    <type name="Test4`1[U]">
+      <method name="Contra`1[Contra`1[Covariant`1[Covariant`1[Contra`1[Contra`1[Contra`1[Contra`1[U]]]]]]]] Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Covariant`1[Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[U]]]]]]]] EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test5`1[U]">
+      <method name="Contra`1[Contra`1[Covariant`1[Covariant`1[Contra`1[Contra`1[Contra`1[U]]]]]]] Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
-    <type name="Test2`1[U]">
-      <method name="Contra`1[Covariant`1[Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[U]]]]]]]]] Invoke()" attrs="454">
+    <type name="Test6`1[U]">
+      <method name="Void Invoke(Covariant`1[Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[U]]]]]]]])" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Contra`1[Covariant`1[Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[U]]]]]]]]] EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Both`2[U,V]">
+      <method name="Void Invoke(CoContra`2[U,V])" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
-    <type name="Test3`1[U]">
-      <method name="Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Contra`1[Contra`1[U]]]]]]]] Invoke()" attrs="454">
+    <type name="Both2`2[U,V]">
+      <method name="Void Invoke(CoContra`2[U,Contra`1[U]])" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Contra`1[Contra`1[U]]]]]]]] EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Both3`2[U,V]">
+      <method name="Void Invoke(CoContra`2[U,Contra`1[System.Int32]])" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
-    <type name="Test4`1[U]">
-      <method name="Contra`1[Contra`1[Covariant`1[Covariant`1[Contra`1[Contra`1[Contra`1[Contra`1[U]]]]]]]] Invoke()" attrs="454">
+    <type name="Both4`2[U,V]">
+      <method name="Void Invoke(Both`2[V,U])" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Contra`1[Contra`1[Covariant`1[Covariant`1[Contra`1[Contra`1[Contra`1[Contra`1[U]]]]]]]] EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Both5`2[U,V]">
+      <method name="Void Invoke(Both`2[V,System.Int32])" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
-    <type name="Test5`1[U]">
-      <method name="Contra`1[Contra`1[Covariant`1[Covariant`1[Contra`1[Contra`1[Contra`1[U]]]]]]] Invoke()" attrs="454">
+    <type name="C">
+      <method name="Void Main()" attrs="150">
+        <size>2</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="Covariant`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="T EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Contra`1[Contra`1[Covariant`1[Covariant`1[Contra`1[Contra`1[Contra`1[U]]]]]]] EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Contra`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Test6`1[U]">
-      <method name="Void Invoke(Covariant`1[Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[U]]]]]]]])" attrs="454">
+    <type name="CoContra`2[TR,T]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Covariant`1[Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[U]]]]]]]], System.AsyncCallback, System.Object)" attrs="454">
+      <method name="TR EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="None`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Both`2[U,V]">
-      <method name="Void Invoke(CoContra`2[U,V])" attrs="454">
+    <type name="Test`1[U]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(CoContra`2[U,V], System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Covariant`1[Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[U]]]]]]]] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test2`1[U]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Contra`1[Covariant`1[Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[U]]]]]]]]] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Both2`2[U,V]">
-      <method name="Void Invoke(CoContra`2[U,Contra`1[U]])" attrs="454">
+    <type name="Test3`1[U]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(CoContra`2[U,Contra`1[U]], System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Contra`1[Contra`1[U]]]]]]]] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test4`1[U]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Contra`1[Contra`1[Covariant`1[Covariant`1[Contra`1[Contra`1[Contra`1[Contra`1[U]]]]]]]] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Both3`2[U,V]">
-      <method name="Void Invoke(CoContra`2[U,Contra`1[System.Int32]])" attrs="454">
+    <type name="Test5`1[U]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(CoContra`2[U,Contra`1[System.Int32]], System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Contra`1[Contra`1[Covariant`1[Covariant`1[Contra`1[Contra`1[Contra`1[U]]]]]]] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test6`1[U]">
+      <method name="System.IAsyncResult BeginInvoke(Covariant`1[Contra`1[Contra`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[Covariant`1[U]]]]]]]], System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Both4`2[U,V]">
-      <method name="Void Invoke(Both`2[V,U])" attrs="454">
+    <type name="Both`2[U,V]">
+      <method name="System.IAsyncResult BeginInvoke(CoContra`2[U,V], System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Both`2[V,U], System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Both2`2[U,V]">
+      <method name="System.IAsyncResult BeginInvoke(CoContra`2[U,Contra`1[U]], System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Both5`2[U,V]">
-      <method name="Void Invoke(Both`2[V,System.Int32])" attrs="454">
+    <type name="Both3`2[U,V]">
+      <method name="System.IAsyncResult BeginInvoke(CoContra`2[U,Contra`1[System.Int32]], System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Both`2[V,System.Int32], System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Both4`2[U,V]">
+      <method name="System.IAsyncResult BeginInvoke(Both`2[V,U], System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="C">
-      <method name="Void Main()" attrs="150">
-        <size>2</size>
+    <type name="Both5`2[U,V]">
+      <method name="System.IAsyncResult BeginInvoke(Both`2[V,System.Int32], System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
       </method>
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
       </method>
     </type>
   </test>
@@ -29776,21 +30239,12 @@
       <method name="Void bchar()" attrs="129">
         <size>28</size>
       </method>
-      <method name="Void afloat(SByte, Byte, Int16, UInt16, Int32, UInt32, Int64, UInt64, Char, Decimal)" attrs="129">
-        <size>2</size>
-      </method>
       <method name="Void bfloat()" attrs="129">
         <size>68</size>
       </method>
-      <method name="Void adouble(SByte, Byte, Int16, UInt16, Int32, UInt32, Int64, UInt64, Char, Single, Decimal)" attrs="129">
-        <size>2</size>
-      </method>
       <method name="Void bdouble()" attrs="129">
         <size>76</size>
       </method>
-      <method name="Void TestDecimal(Decimal)" attrs="129">
-        <size>16</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
@@ -29806,6 +30260,17 @@
         <size>7</size>
       </method>
     </type>
+    <type name="X">
+      <method name="Void afloat(SByte, Byte, Int16, UInt16, Int32, UInt32, Int64, UInt64, Char, System.Decimal)" attrs="129">
+        <size>2</size>
+      </method>
+      <method name="Void adouble(SByte, Byte, Int16, UInt16, Int32, UInt32, Int64, UInt64, Char, Single, System.Decimal)" attrs="129">
+        <size>2</size>
+      </method>
+      <method name="Void TestDecimal(System.Decimal)" attrs="129">
+        <size>16</size>
+      </method>
+    </type>
   </test>
   <test name="test-100.cs">
     <type name="GLib.Object">
@@ -29910,9 +30375,6 @@
       <method name="Int32 F(Int32)" attrs="145">
         <size>41</size>
       </method>
-      <method name="Void async_callback(IAsyncResult)" attrs="145">
-        <size>23</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>427</size>
       </method>
@@ -29924,13 +30386,20 @@
       <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test">
+      <method name="Void async_callback(System.IAsyncResult)" attrs="145">
+        <size>23</size>
+      </method>
+    </type>
+    <type name="Test+SimpleDelegate">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -29940,9 +30409,6 @@
       <method name="Int32 F(Int32)" attrs="145">
         <size>28</size>
       </method>
-      <method name="Void async_callback(IAsyncResult)" attrs="145">
-        <size>101</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>97</size>
       </method>
@@ -29957,13 +30423,20 @@
       <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test">
+      <method name="Void async_callback(System.IAsyncResult)" attrs="145">
+        <size>101</size>
+      </method>
+    </type>
+    <type name="Test+SimpleDelegate">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -30029,15 +30502,15 @@
   </test>
   <test name="test-112.cs">
     <type name="X">
-      <method name="System.Int32[] g()" attrs="145">
-        <size>22</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>31</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Int32[] g()" attrs="145">
+        <size>22</size>
+      </method>
     </type>
   </test>
   <test name="test-113.cs">
@@ -30075,13 +30548,13 @@
       <method name="Boolean Invoke(Char)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Char, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Boolean EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(Char, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Boolean EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -30923,12 +31396,6 @@
       <method name="Int64 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int64 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -30972,12 +31439,6 @@
       </method>
     </type>
     <type name="Z">
-      <method name="Void add_BuildStarted(Z+SomeEventHandler)" attrs="2198">
-        <size>40</size>
-      </method>
-      <method name="Void remove_BuildStarted(Z+SomeEventHandler)" attrs="2198">
-        <size>40</size>
-      </method>
       <method name="Int32 a()" attrs="145">
         <size>10</size>
       </method>
@@ -30992,12 +31453,6 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -31016,6 +31471,30 @@
         <size>7</size>
       </method>
     </type>
+    <type name="MyDelegate">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int64 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="Z">
+      <method name="Void add_BuildStarted(SomeEventHandler)" attrs="2198">
+        <size>40</size>
+      </method>
+      <method name="Void remove_BuildStarted(SomeEventHandler)" attrs="2198">
+        <size>40</size>
+      </method>
+    </type>
+    <type name="Z+SomeEventHandler">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-15.cs">
     <type name="Implementor">
@@ -31108,9 +31587,6 @@
       <method name="Void test2(Int32, Single ByRef)" attrs="150">
         <size>41</size>
       </method>
-      <method name="Void test3(System.Int64[], Int32)" attrs="150">
-        <size>22</size>
-      </method>
       <method name="Int32 test4(Int32, Single ByRef)" attrs="150">
         <size>41</size>
       </method>
@@ -31120,9 +31596,6 @@
       <method name="Int32 test6(Single ByRef)" attrs="150">
         <size>18</size>
       </method>
-      <method name="Int64 test7(System.Int32[], Int32)" attrs="150">
-        <size>75</size>
-      </method>
       <method name="Int64 test8(Int32)" attrs="150">
         <size>44</size>
       </method>
@@ -31228,6 +31701,12 @@
       <method name="Void test42(Int32)" attrs="134">
         <size>73</size>
       </method>
+      <method name="Void test3(Int64[], Int32)" attrs="150">
+        <size>22</size>
+      </method>
+      <method name="Int64 test7(Int32[], Int32)" attrs="150">
+        <size>75</size>
+      </method>
     </type>
   </test>
   <test name="test-155.cs">
@@ -31452,9 +31931,6 @@
       </method>
     </type>
     <type name="H">
-      <method name="Void Test(System.Int32[])" attrs="134">
-        <size>2</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -31467,6 +31943,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="H">
+      <method name="Void Test(Int32[])" attrs="134">
+        <size>2</size>
+      </method>
+    </type>
   </test>
   <test name="test-157.cs">
     <type name="Test.MyAttribute">
@@ -31571,9 +32052,6 @@
   </test>
   <test name="test-161.cs">
     <type name="ZipEntry">
-      <method name="DateTime get_DateTime()" attrs="2182">
-        <size>15</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>10</size>
       </method>
@@ -31583,6 +32061,9 @@
       <method name="Void .ctor(ZipEntry)" attrs="6278">
         <size>19</size>
       </method>
+      <method name="System.DateTime get_DateTime()" attrs="2182">
+        <size>15</size>
+      </method>
     </type>
   </test>
   <test name="test-162.cs">
@@ -31684,12 +32165,6 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -31708,6 +32183,14 @@
         <size>8</size>
       </method>
     </type>
+    <type name="X+FooDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-165.cs">
     <type name="Testing">
@@ -31751,15 +32234,15 @@
   </test>
   <test name="test-167.cs">
     <type name="X">
-      <method name="Int32 Test(X+Foo[])" attrs="145">
-        <size>41</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>62</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Int32 Test(Foo[])" attrs="145">
+        <size>41</size>
+      </method>
     </type>
   </test>
   <test name="test-168.cs">
@@ -32000,9 +32483,6 @@
       </method>
     </type>
     <type name="TestAccessToPrivateMemberInParentClass">
-      <method name="System.Double[][] get_Array()" attrs="2177">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>8</size>
       </method>
@@ -32021,9 +32501,6 @@
       </method>
     </type>
     <type name="TestAccessToProtectedOnChildInstanceFromParent+Parent">
-      <method name="Int32 TestAccessToProtected(TestAccessToProtectedOnChildInstanceFromParent+Child)" attrs="134">
-        <size>28</size>
-      </method>
       <method name="Void .ctor()" attrs="6276">
         <size>27</size>
       </method>
@@ -32033,6 +32510,16 @@
         <size>7</size>
       </method>
     </type>
+    <type name="TestAccessToPrivateMemberInParentClass">
+      <method name="Double[][] get_Array()" attrs="2177">
+        <size>15</size>
+      </method>
+    </type>
+    <type name="TestAccessToProtectedOnChildInstanceFromParent+Parent">
+      <method name="Int32 TestAccessToProtected(Child)" attrs="134">
+        <size>28</size>
+      </method>
+    </type>
   </test>
   <test name="test-175.cs">
     <type name="RVA">
@@ -32231,13 +32718,13 @@
       <method name="Int32 Invoke(Int32, Int32 ByRef)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, Int32 ByRef, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(Int32 ByRef, IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(Int32, Int32 ByRef, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Int32 EndInvoke(Int32 ByRef, System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -32370,9 +32857,6 @@
       <method name="Int32 m(Int32, Double)" attrs="150">
         <size>10</size>
       </method>
-      <method name="Int32 m(Int32, System.Int32[])" attrs="150">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -32399,6 +32883,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="MyTest">
+      <method name="Int32 m(Int32, Int32[])" attrs="150">
+        <size>10</size>
+      </method>
+    </type>
   </test>
   <test name="test-19.cs">
     <type name="I">
@@ -32416,12 +32905,6 @@
       <method name="System.String Invoke(System.String)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="System.String EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -32453,12 +32936,6 @@
       <method name="Int32 Invoke(Int32, Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -32467,12 +32944,6 @@
       <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -32486,13 +32957,39 @@
       <method name="Single Invoke(Single, System.Object[])" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Single, System.Object[], System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Single EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="I+GetTextFn">
+      <method name="System.IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="System.String EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="X+Foo">
+      <method name="System.IAsyncResult BeginInvoke(Int32, Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="NameSpace.TestDelegate">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="TestNamespace.TestClass+NotWorkingDelegate">
+      <method name="System.IAsyncResult BeginInvoke(Single, System.Object[], System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Single EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -32964,15 +33461,15 @@
       <method name="Int32 get_Item(Int32)" attrs="2182">
         <size>10</size>
       </method>
-      <method name="System.Int32[] get_Item(System.Int32[])" attrs="2534">
-        <size>47</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>92</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Int32[] get_Item(Int32[])" attrs="2534">
+        <size>47</size>
+      </method>
     </type>
   </test>
   <test name="test-207.cs">
@@ -32980,12 +33477,6 @@
       <method name="Void Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -33007,6 +33498,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-208.cs">
     <type name="X">
@@ -33091,12 +33590,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -33112,6 +33605,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="FooHandler">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-211.cs">
     <type name="X">
@@ -33220,12 +33721,6 @@
       <method name="Void Invoke(System.String)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -33263,6 +33758,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="OnWhateverDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-217.cs">
     <type name="Test">
@@ -33299,13 +33802,13 @@
       <method name="Void Invoke(System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -33367,9 +33870,6 @@
       <method name="Void Add(MonoBUG.Foo)" attrs="134">
         <size>20</size>
       </method>
-      <method name="MonoBUG.FooList+FooEnumerator GetEnumerator()" attrs="134">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>8</size>
       </method>
@@ -33400,6 +33900,11 @@
         <size>32</size>
       </method>
     </type>
+    <type name="MonoBUG.FooList">
+      <method name="FooEnumerator GetEnumerator()" attrs="134">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="test-221.cs">
     <type name="A">
@@ -33528,12 +34033,6 @@
   </test>
   <test name="test-224.cs">
     <type name="XmlMemberArrayAttribute">
-      <method name="System.Char[] get_Separator()" attrs="2182">
-        <size>15</size>
-      </method>
-      <method name="Void set_Separator(System.Char[])" attrs="2182">
-        <size>9</size>
-      </method>
       <method name="System.String get_Name()" attrs="2182">
         <size>15</size>
       </method>
@@ -33558,6 +34057,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="XmlMemberArrayAttribute">
+      <method name="Char[] get_Separator()" attrs="2182">
+        <size>15</size>
+      </method>
+      <method name="Void set_Separator(Char[])" attrs="2182">
+        <size>9</size>
+      </method>
+    </type>
   </test>
   <test name="test-225.cs">
     <type name="A">
@@ -33623,9 +34130,6 @@
   </test>
   <test name="test-229.cs">
     <type name="List">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>20</size>
-      </method>
       <method name="Void Add(Int32)" attrs="134">
         <size>27</size>
       </method>
@@ -33667,6 +34171,11 @@
         <size>9</size>
       </method>
     </type>
+    <type name="List">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>20</size>
+      </method>
+    </type>
   </test>
   <test name="test-23.cs">
     <type name="X">
@@ -33899,13 +34408,13 @@
       <method name="Void Invoke(System.String, System.Object[])" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.String, System.Object[], System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.String, System.Object[], System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -34107,11 +34616,6 @@
     </type>
   </test>
   <test name="test-247.cs">
-    <type name="Blah">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>19</size>
-      </method>
-    </type>
     <type name="B">
       <method name="Void Main()" attrs="150">
         <size>73</size>
@@ -34120,6 +34624,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Blah">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>19</size>
+      </method>
+    </type>
   </test>
   <test name="test-248.cs">
     <type name="T">
@@ -34184,12 +34693,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -34211,6 +34714,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-253.cs">
     <type name="AccessibleAttribute">
@@ -34250,12 +34761,6 @@
       <method name="System.Delegate Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="System.Delegate EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -34328,6 +34833,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="test_delegate">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.Delegate EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-255.cs">
     <type name="TestAttribute">
@@ -34420,9 +34933,6 @@
       <method name="Int32 Test1()" attrs="150">
         <size>130</size>
       </method>
-      <method name="Int32 Adder(System.Int32[])" attrs="150">
-        <size>45</size>
-      </method>
       <method name="Int32 Test2()" attrs="150">
         <size>59</size>
       </method>
@@ -34437,27 +34947,36 @@
       <method name="Int32 Invoke(Int32, Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
+    </type>
+    <type name="Blah+List">
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
-    <type name="Blah+List">
-      <method name="Int32 Invoke(System.Int32[])" attrs="454">
+    <type name="Blah">
+      <method name="Int32 Adder(Int32[])" attrs="150">
+        <size>45</size>
+      </method>
+    </type>
+    <type name="Blah+MyDelegate">
+      <method name="System.IAsyncResult BeginInvoke(Int32, Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Int32[], System.AsyncCallback, System.Object)" attrs="454">
+    </type>
+    <type name="Blah+List">
+      <method name="Int32 Invoke(Int32[])" attrs="454">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(Int32[], System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -34524,15 +35043,15 @@
   </test>
   <test name="test-263.cs">
     <type name="Test">
-      <method name="System.String GetString(System.Byte[])" attrs="134">
-        <size>31</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="System.String GetString(Byte[])" attrs="134">
+        <size>31</size>
+      </method>
     </type>
   </test>
   <test name="test-264.cs">
@@ -34676,13 +35195,13 @@
       <method name="Void Invoke(Int32, Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(Int32, Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -34716,7 +35235,7 @@
       </method>
     </type>
     <type name="T+C">
-      <method name="IEnumerator GetEnumerator()" attrs="486">
+      <method name="System.Collections.IEnumerator GetEnumerator()" attrs="486">
         <size>19</size>
       </method>
     </type>
@@ -34797,12 +35316,6 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -34841,6 +35354,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="DelType">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-276.cs">
     <type name="EventTestClass">
@@ -35040,12 +35561,6 @@
       </method>
     </type>
     <type name="Y">
-      <method name="Y+D GetIt()" attrs="129">
-        <size>21</size>
-      </method>
-      <method name="Y+D GetIt2()" attrs="129">
-        <size>21</size>
-      </method>
       <method name="Int32 Foo()" attrs="198">
         <size>10</size>
       </method>
@@ -35060,13 +35575,23 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Y">
+      <method name="D GetIt()" attrs="129">
+        <size>21</size>
+      </method>
+      <method name="D GetIt2()" attrs="129">
+        <size>21</size>
+      </method>
+    </type>
+    <type name="Y+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -35125,12 +35650,6 @@
       <method name="System.Object Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="System.Object EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -35143,6 +35662,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="StaticClass+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.Object EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-288.cs">
     <type name="Test.BookAboutMovie">
@@ -35213,12 +35740,6 @@
   </test>
   <test name="test-290.cs">
     <type name="EntryPoint">
-      <method name="Void add_FooEvent(EntryPoint+EventHandler)" attrs="2193">
-        <size>40</size>
-      </method>
-      <method name="Void remove_FooEvent(EntryPoint+EventHandler)" attrs="2193">
-        <size>40</size>
-      </method>
       <method name="Void bar_f(System.Object)" attrs="145">
         <size>2</size>
       </method>
@@ -35233,13 +35754,23 @@
       <method name="Void Invoke(System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="EntryPoint">
+      <method name="Void add_FooEvent(EventHandler)" attrs="2193">
+        <size>40</size>
+      </method>
+      <method name="Void remove_FooEvent(EventHandler)" attrs="2193">
+        <size>40</size>
+      </method>
+    </type>
+    <type name="EntryPoint+EventHandler">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -36134,12 +36665,6 @@
       <method name="Double Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Double EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -36155,6 +36680,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Mapper">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Double EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-327.cs">
     <type name="X2">
@@ -36329,27 +36862,31 @@
       <method name="Void Invoke(Int32, Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="X+D">
+      <method name="Void Invoke(Int32 ByRef)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
-    <type name="X+D">
-      <method name="Void Invoke(Int32 ByRef)" attrs="454">
+    <type name="X+B">
+      <method name="System.IAsyncResult BeginInvoke(Int32, Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32 ByRef, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(Int32 ByRef, IAsyncResult)" attrs="454">
+    </type>
+    <type name="X+D">
+      <method name="System.IAsyncResult BeginInvoke(Int32 ByRef, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(Int32 ByRef, System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -36359,12 +36896,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -36373,12 +36904,6 @@
       <method name="Void Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -36397,6 +36922,22 @@
         <size>8</size>
       </method>
     </type>
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="Bar">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-337.cs">
     <type name="Test">
@@ -36413,9 +36954,6 @@
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
-      <method name="Y+Z fz()" attrs="145">
-        <size>14</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -36436,6 +36974,11 @@
         <size>11</size>
       </method>
     </type>
+    <type name="X">
+      <method name="Z fz()" attrs="145">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-339.cs">
     <type name="C">
@@ -36460,9 +37003,6 @@
       <method name="Void Foo(Int32 ByRef, Int32 ByRef)" attrs="150">
         <size>8</size>
       </method>
-      <method name="Int32 Bar(Int32, System.Int32[])" attrs="150">
-        <size>74</size>
-      </method>
       <method name="Void Foo(Int32, Int32)" attrs="150">
         <size>8</size>
       </method>
@@ -36472,9 +37012,6 @@
       <method name="Void Out(Int32 ByRef)" attrs="145">
         <size>8</size>
       </method>
-      <method name="Int32 AddArray(System.Int32[])" attrs="145">
-        <size>38</size>
-      </method>
       <method name="Int32 AddFancy(FancyInt[])" attrs="145">
         <size>47</size>
       </method>
@@ -36484,6 +37021,12 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Int32 Bar(Int32, Int32[])" attrs="150">
+        <size>74</size>
+      </method>
+      <method name="Int32 AddArray(Int32[])" attrs="145">
+        <size>38</size>
+      </method>
     </type>
   </test>
   <test name="test-340.cs">
@@ -36588,12 +37131,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -36623,6 +37160,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Y">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-345.cs">
     <type name="EntryPoint">
@@ -36724,12 +37269,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -36784,6 +37323,14 @@
         <size>19</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-35.cs">
     <type name="X">
@@ -36829,12 +37376,6 @@
       <method name="Void Invoke(System.String, System.Object[])" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.String, System.Object[], System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -36850,6 +37391,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test.Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.String, System.Object[], System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-352.cs">
     <type name="C">
@@ -36937,13 +37486,13 @@
       <method name="Void Invoke(Boolean)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Boolean, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(Boolean, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -36969,11 +37518,6 @@
     </type>
   </test>
   <test name="test-36.cs">
-    <type name="X">
-      <method name="IEnumerator GetEnumerator()" attrs="134">
-        <size>43</size>
-      </method>
-    </type>
     <type name="Y">
       <method name="Int32 Main()" attrs="150">
         <size>311</size>
@@ -36982,6 +37526,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="X">
+      <method name="System.Collections.IEnumerator GetEnumerator()" attrs="134">
+        <size>43</size>
+      </method>
+    </type>
   </test>
   <test name="test-360.cs">
     <type name="Application">
@@ -37072,12 +37621,6 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -37121,6 +37664,14 @@
         <size>34</size>
       </method>
     </type>
+    <type name="X+Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-365.cs">
     <type name="C">
@@ -37189,9 +37740,6 @@
   </test>
   <test name="test-37.cs">
     <type name="X">
-      <method name="Void m(System.Int32[])" attrs="145">
-        <size>10</size>
-      </method>
       <method name="Int32 test_int_single_dim()" attrs="145">
         <size>108</size>
       </method>
@@ -37204,6 +37752,9 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Void m(Int32[])" attrs="145">
+        <size>10</size>
+      </method>
     </type>
   </test>
   <test name="test-370.cs">
@@ -37499,15 +38050,15 @@
   </test>
   <test name="test-386.cs">
     <type name="SuperDecimal">
-      <method name="SuperDecimal op_Implicit(Decimal)" attrs="2198">
-        <size>15</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>16</size>
       </method>
       <method name="Void .ctor(Decimal)" attrs="6278">
         <size>15</size>
       </method>
+      <method name="SuperDecimal op_Implicit(System.Decimal)" attrs="2198">
+        <size>15</size>
+      </method>
     </type>
   </test>
   <test name="test-387.cs">
@@ -37640,12 +38191,6 @@
       <method name="Void set_LongValue(Int64)" attrs="2182">
         <size>2</size>
       </method>
-      <method name="System.Int64[] get_ArrayValue()" attrs="2182">
-        <size>15</size>
-      </method>
-      <method name="Void set_ArrayValue(System.Int64[])" attrs="2182">
-        <size>2</size>
-      </method>
       <method name="Void .ctor(String)" attrs="6278">
         <size>22</size>
       </method>
@@ -37668,6 +38213,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="SimpleAttribute">
+      <method name="Int64[] get_ArrayValue()" attrs="2182">
+        <size>15</size>
+      </method>
+      <method name="Void set_ArrayValue(Int64[])" attrs="2182">
+        <size>2</size>
+      </method>
+    </type>
   </test>
   <test name="test-390.cs">
     <type name="C">
@@ -37783,13 +38336,13 @@
       <method name="A Invoke(System.String)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="A EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="A EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -37843,13 +38396,13 @@
       <method name="System.String Invoke(C)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(C, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="System.String EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(C, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="System.String EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -37897,13 +38450,13 @@
       <method name="Void Invoke(C, C, C)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(C, C, C, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(C, C, C, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -37930,9 +38483,6 @@
       </method>
     </type>
     <type name="AccessorCheckAttribute">
-      <method name="MethodAttributes get_Attributes()" attrs="2182">
-        <size>15</size>
-      </method>
       <method name="Void .ctor(MethodAttributes)" attrs="6278">
         <size>15</size>
       </method>
@@ -37983,6 +38533,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="AccessorCheckAttribute">
+      <method name="System.Reflection.MethodAttributes get_Attributes()" attrs="2182">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="test-398.cs">
     <type name="Tester">
@@ -38033,9 +38588,6 @@
   </test>
   <test name="test-399.cs">
     <type name="TestVararg">
-      <method name="Void F(RuntimeArgumentHandle)" attrs="145">
-        <size>2</size>
-      </method>
       <method name="Void G(...)" attrs="145">
         <size>23</size>
       </method>
@@ -38045,6 +38597,9 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Void F(System.RuntimeArgumentHandle)" attrs="145">
+        <size>2</size>
+      </method>
     </type>
   </test>
   <test name="test-4.cs">
@@ -38104,7 +38659,7 @@
   <test name="test-401.cs">
     <type name="X">
       <method name="Int32 Main()" attrs="150">
-        <size>207</size>
+        <size>206</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
@@ -38590,27 +39145,27 @@
   </test>
   <test name="test-43.cs">
     <type name="X">
-      <method name="Int32 test_single(System.Int32[])" attrs="145">
+      <method name="Int32 Main()" attrs="150">
+        <size>332</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+      <method name="Int32 test_single(Int32[])" attrs="145">
         <size>45</size>
       </method>
-      <method name="Int32 test_continue(System.Int32[])" attrs="145">
+      <method name="Int32 test_continue(Int32[])" attrs="145">
         <size>70</size>
       </method>
-      <method name="Boolean test_double(System.Double[])" attrs="145">
+      <method name="Boolean test_double(Double[])" attrs="145">
         <size>74</size>
       </method>
-      <method name="Int32 test_break(System.Int32[])" attrs="145">
+      <method name="Int32 test_break(Int32[])" attrs="145">
         <size>70</size>
       </method>
-      <method name="Boolean test_multi(System.Int32[,])" attrs="145">
+      <method name="Boolean test_multi(Int32[,])" attrs="145">
         <size>100</size>
       </method>
-      <method name="Int32 Main()" attrs="150">
-        <size>332</size>
-      </method>
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
-      </method>
     </type>
   </test>
   <test name="test-430.cs">
@@ -38701,28 +39256,28 @@
   </test>
   <test name="test-435.cs">
     <type name="X">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>10</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>8</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>10</size>
+      </method>
     </type>
   </test>
   <test name="test-436.cs">
     <type name="X">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>10</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>8</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>10</size>
+      </method>
     </type>
   </test>
   <test name="test-437.cs">
@@ -38770,9 +39325,6 @@
   </test>
   <test name="test-44.cs">
     <type name="X">
-      <method name="Int32 dob(System.Int32[,])" attrs="145">
-        <size>94</size>
-      </method>
       <method name="Int32 count(System.Object)" attrs="145">
         <size>50</size>
       </method>
@@ -38782,6 +39334,9 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Int32 dob(Int32[,])" attrs="145">
+        <size>94</size>
+      </method>
     </type>
   </test>
   <test name="test-440.cs">
@@ -39273,12 +39828,6 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -39292,12 +39841,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -39313,16 +39856,26 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-469.cs">
-    <type name="Del">
-      <method name="Void Invoke(Int32)" attrs="454">
+    <type name="A+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="B+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-469.cs">
+    <type name="Del">
+      <method name="Void Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -39354,6 +39907,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Del">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-47.cs">
     <type name="X">
@@ -39428,12 +39989,6 @@
       <method name="Void Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -39506,6 +40061,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="SignalHandler">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-474.cs">
     <type name="Z">
@@ -39529,12 +40092,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -39555,16 +40112,18 @@
         <size>39</size>
       </method>
     </type>
-  </test>
-  <test name="test-475.cs">
-    <type name="MyDelegate">
-      <method name="Void Invoke(Int32)" attrs="454">
+    <type name="Z+X">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-475.cs">
+    <type name="MyDelegate">
+      <method name="Void Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -39591,6 +40150,14 @@
         <size>41</size>
       </method>
     </type>
+    <type name="MyDelegate">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-476.cs">
     <type name="Test">
@@ -39691,13 +40258,13 @@
       <method name="Void Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -39707,12 +40274,6 @@
       <method name="Void Invoke(Int32 ByRef)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32 ByRef, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(Int32 ByRef, IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -39725,6 +40286,14 @@
         <size>5</size>
       </method>
     </type>
+    <type name="TestDelegate">
+      <method name="System.IAsyncResult BeginInvoke(Int32 ByRef, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(Int32 ByRef, System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-482.cs">
     <type name="X">
@@ -39815,15 +40384,15 @@
       </method>
     </type>
     <type name="Test">
-      <method name="IEnumerable foo()" attrs="145">
-        <size>10</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>169</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="System.Collections.IEnumerable foo()" attrs="145">
+        <size>10</size>
+      </method>
     </type>
   </test>
   <test name="test-489.cs">
@@ -40015,13 +40584,13 @@
       <method name="Void Invoke(Agresso.Foundation.Function, System.Text.StringBuilder ByRef)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Agresso.Foundation.Function, System.Text.StringBuilder ByRef, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(System.Text.StringBuilder ByRef, IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(Agresso.Foundation.Function, System.Text.StringBuilder ByRef, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.Text.StringBuilder ByRef, System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -40151,9 +40720,6 @@
   </test>
   <test name="test-501.cs">
     <type name="Tests">
-      <method name="Void DumpException(Tests+FilterStackFrame)" attrs="150">
-        <size>2</size>
-      </method>
       <method name="Void foo(Boolean ByRef)" attrs="150">
         <size>54</size>
       </method>
@@ -40171,13 +40737,20 @@
       <method name="Boolean Invoke(System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Boolean EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Tests">
+      <method name="Void DumpException(FilterStackFrame)" attrs="150">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="Tests+FilterStackFrame">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Boolean EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -40341,12 +40914,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -40370,6 +40937,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="DelegateHandler">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-51.cs">
     <type name="Base">
@@ -40588,13 +41163,13 @@
       <method name="Void Invoke(System.Object, System.Object[])" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.Object[], System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.Object[], System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -40818,12 +41393,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -40845,6 +41414,14 @@
         <size>36</size>
       </method>
     </type>
+    <type name="FooHandler">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-537.cs">
     <type name="Base">
@@ -40900,12 +41477,6 @@
       <method name="IInterface Invoke(concrete)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(concrete, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="IInterface EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -40926,6 +41497,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="testDelegate">
+      <method name="System.IAsyncResult BeginInvoke(concrete, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="IInterface EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-539.cs">
     <type name="Test">
@@ -41002,25 +41581,19 @@
       <method name="Void Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
   </test>
   <test name="test-542.cs">
     <type name="ARec">
-      <method name="Decimal Round(Int32)" attrs="129">
-        <size>21</size>
-      </method>
-      <method name="Decimal Round(Decimal, Int32)" attrs="145">
-        <size>15</size>
-      </method>
       <method name="Void .ctor(Decimal)" attrs="6278">
         <size>15</size>
       </method>
@@ -41033,12 +41606,17 @@
         <size>7</size>
       </method>
     </type>
+    <type name="ARec">
+      <method name="System.Decimal Round(Int32)" attrs="129">
+        <size>21</size>
+      </method>
+      <method name="System.Decimal Round(System.Decimal, Int32)" attrs="145">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="test-543.cs">
     <type name="BetterMethod">
-      <method name="Int32 get_Item(System.Boolean[])" attrs="2182">
-        <size>10</size>
-      </method>
       <method name="System.String get_Item(Boolean, System.Object)" attrs="2182">
         <size>7</size>
       </method>
@@ -41072,6 +41650,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="BetterMethod">
+      <method name="Int32 get_Item(Boolean[])" attrs="2182">
+        <size>10</size>
+      </method>
+    </type>
   </test>
   <test name="test-544.cs">
     <type name="X">
@@ -41144,12 +41727,6 @@
       <method name="System.Object Invoke(Do)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Do, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="System.Object EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -41179,6 +41756,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Get">
+      <method name="System.IAsyncResult BeginInvoke(Do, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.Object EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-55.cs">
     <type name="A.B.C">
@@ -41327,31 +41912,31 @@
       <method name="Void Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
   </test>
   <test name="test-559.cs">
     <type name="C">
-      <method name="Void add_TestEvent(B+TestDelegate)" attrs="2246">
-        <size>42</size>
-      </method>
-      <method name="Void remove_TestEvent(B+TestDelegate)" attrs="2246">
-        <size>42</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Void add_TestEvent(TestDelegate)" attrs="2246">
+        <size>42</size>
+      </method>
+      <method name="Void remove_TestEvent(TestDelegate)" attrs="2246">
+        <size>42</size>
+      </method>
     </type>
   </test>
   <test name="test-56.cs">
@@ -41573,12 +42158,6 @@
       </method>
     </type>
     <type name="preservesig_test.TestClass">
-      <method name="Void add_e(preservesig_test.TestClass+D)" attrs="2182">
-        <size>42</size>
-      </method>
-      <method name="Void remove_e(preservesig_test.TestClass+D)" attrs="2182">
-        <size>42</size>
-      </method>
       <method name="Int32 DoFoo()" attrs="134">
         <size>10</size>
       </method>
@@ -41593,13 +42172,23 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="preservesig_test.TestClass">
+      <method name="Void add_e(D)" attrs="2182">
+        <size>42</size>
+      </method>
+      <method name="Void remove_e(D)" attrs="2182">
+        <size>42</size>
+      </method>
+    </type>
+    <type name="preservesig_test.TestClass+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -41642,12 +42231,6 @@
       <method name="Void Invoke(Int32, Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -41689,6 +42272,14 @@
         <size>18</size>
       </method>
     </type>
+    <type name="EventHandler">
+      <method name="System.IAsyncResult BeginInvoke(Int32, Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-570.cs">
     <type name="Bar">
@@ -41809,12 +42400,6 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -41855,6 +42440,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test1.TestDelegate1">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-579.cs">
     <type name="TestCase">
@@ -42289,9 +42882,6 @@
       </method>
     </type>
     <type name="TestNS.Bar">
-      <method name="IHoge get_Root()" attrs="2182">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -42304,6 +42894,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="TestNS.Bar">
+      <method name="TestNS.IHoge get_Root()" attrs="2182">
+        <size>10</size>
+      </method>
+    </type>
   </test>
   <test name="test-598.cs">
     <type name="V">
@@ -42395,13 +42990,13 @@
       <method name="Void Invoke(IntPtr, IntPtr)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(IntPtr, IntPtr, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(IntPtr, IntPtr, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -42429,14 +43024,14 @@
       <method name="Int32 Test_A(System.String, System.Object[])" attrs="145">
         <size>10</size>
       </method>
-      <method name="Int32 Test_C(System.Type, System.Int32[])" attrs="145">
-        <size>10</size>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
       </method>
-      <method name="Int32 Test_C(System.Type, System.Int32[], System.Int32[])" attrs="145">
+      <method name="Int32 Test_C(System.Type, Int32[])" attrs="145">
         <size>10</size>
       </method>
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
+      <method name="Int32 Test_C(System.Type, Int32[], Int32[])" attrs="145">
+        <size>10</size>
       </method>
     </type>
   </test>
@@ -42569,12 +43164,6 @@
       <method name="Void set_P3(Int32)" attrs="2177">
         <size>2</size>
       </method>
-      <method name="Void add_XX(X+MyEvent)" attrs="2182">
-        <size>4</size>
-      </method>
-      <method name="Void remove_XX(X+MyEvent)" attrs="2182">
-        <size>4</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>10</size>
       </method>
@@ -42586,13 +43175,23 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="X">
+      <method name="Void add_XX(MyEvent)" attrs="2182">
+        <size>4</size>
+      </method>
+      <method name="Void remove_XX(MyEvent)" attrs="2182">
+        <size>4</size>
+      </method>
+    </type>
+    <type name="X+MyEvent">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -42659,9 +43258,6 @@
       </method>
     </type>
     <type name="D+Private">
-      <method name="Void Stuff(T+Protected)" attrs="134">
-        <size>2</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -42677,9 +43273,6 @@
       </method>
     </type>
     <type name="D2+P+Private">
-      <method name="Void Stuff(T+Protected)" attrs="134">
-        <size>2</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -42692,6 +43285,16 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D+Private">
+      <method name="Void Stuff(Protected)" attrs="134">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="D2+P+Private">
+      <method name="Void Stuff(Protected)" attrs="134">
+        <size>2</size>
+      </method>
+    </type>
   </test>
   <test name="test-612.cs">
     <type name="Abcdefghijklmnopqrstuvwxyz">
@@ -42774,12 +43377,6 @@
       <method name="Int64 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int64 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -42807,6 +43404,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="MyDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int64 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-618.cs">
     <type name="C">
@@ -42839,18 +43444,18 @@
       <method name="X[] GetX()" attrs="129">
         <size>10</size>
       </method>
-      <method name="System.Int32[] getInt()" attrs="129">
-        <size>10</size>
-      </method>
-      <method name="System.Int32[,,] getMoreInt()" attrs="129">
-        <size>10</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>10</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Int32[] getInt()" attrs="129">
+        <size>10</size>
+      </method>
+      <method name="Int32[,,] getMoreInt()" attrs="129">
+        <size>10</size>
+      </method>
     </type>
   </test>
   <test name="test-620.cs">
@@ -43171,9 +43776,6 @@
       </method>
     </type>
     <type name="MyDecimal">
-      <method name="Decimal op_Implicit(MyDecimal)" attrs="2198">
-        <size>16</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -43186,6 +43788,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="MyDecimal">
+      <method name="System.Decimal op_Implicit(MyDecimal)" attrs="2198">
+        <size>16</size>
+      </method>
+    </type>
   </test>
   <test name="test-632.cs">
     <type name="Bug379822">
@@ -43235,12 +43842,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -43250,6 +43851,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-635.cs">
     <type name="ShortCircuitFold">
@@ -43411,15 +44020,15 @@
       <method name="System.String op_Implicit(Identifier)" attrs="2198">
         <size>10</size>
       </method>
-      <method name="Decimal op_Implicit(Identifier)" attrs="2198">
-        <size>15</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>73</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>8</size>
       </method>
+      <method name="System.Decimal op_Implicit(Identifier)" attrs="2198">
+        <size>15</size>
+      </method>
     </type>
   </test>
   <test name="test-642.cs">
@@ -43468,9 +44077,6 @@
       <method name="Boolean Test_3()" attrs="134">
         <size>32</size>
       </method>
-      <method name="Boolean Test_4(Program+D)" attrs="134">
-        <size>21</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>98</size>
       </method>
@@ -43482,13 +44088,20 @@
       <method name="System.Object Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="System.Object EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Program">
+      <method name="Boolean Test_4(D)" attrs="134">
+        <size>21</size>
+      </method>
+    </type>
+    <type name="Program+D">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="System.Object EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -43558,21 +44171,21 @@
       </method>
     </type>
     <type name="MainClass+Decimal2">
-      <method name="Decimal2 op_Explicit(Decimal)" attrs="2198">
-        <size>15</size>
-      </method>
       <method name="Decimal2 op_Explicit(Double)" attrs="2198">
         <size>15</size>
       </method>
-      <method name="Decimal op_Implicit(Decimal2)" attrs="2198">
-        <size>16</size>
-      </method>
       <method name="Void .ctor(Double)" attrs="6278">
         <size>14</size>
       </method>
       <method name="Void .ctor(Decimal)" attrs="6278">
         <size>9</size>
       </method>
+      <method name="Decimal2 op_Explicit(System.Decimal)" attrs="2198">
+        <size>15</size>
+      </method>
+      <method name="System.Decimal op_Implicit(Decimal2)" attrs="2198">
+        <size>16</size>
+      </method>
     </type>
   </test>
   <test name="test-65.cs">
@@ -43606,9 +44219,6 @@
   </test>
   <test name="test-651.cs">
     <type name="Foo">
-      <method name="Void Open(IList)" attrs="129">
-        <size>2</size>
-      </method>
       <method name="Void Open(System.Collections.ArrayList ByRef)" attrs="129">
         <size>21</size>
       </method>
@@ -43618,6 +44228,9 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Void Open(System.Collections.IList)" attrs="129">
+        <size>2</size>
+      </method>
     </type>
   </test>
   <test name="test-652.cs">
@@ -44014,13 +44627,13 @@
       <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -44092,12 +44705,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -44116,6 +44723,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-678.cs">
     <type name="NaNTest">
@@ -44154,23 +44769,11 @@
   </test>
   <test name="test-681.cs">
     <type name="BugClass">
-      <method name="Void FooImplementation(System.Void*)" attrs="145">
-        <size>2</size>
-      </method>
       <method name="Void .cctor()" attrs="6289">
         <size>18</size>
       </method>
     </type>
     <type name="BugClass+Foo">
-      <method name="Void Invoke(System.Void*)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="IAsyncResult BeginInvoke(System.Void*, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -44183,6 +44786,22 @@
         <size>20</size>
       </method>
     </type>
+    <type name="BugClass">
+      <method name="Void FooImplementation(Void*)" attrs="145">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="BugClass+Foo">
+      <method name="Void Invoke(Void*)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.IAsyncResult BeginInvoke(Void*, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-682.cs">
     <type name="broken_cast">
@@ -44224,12 +44843,12 @@
       <method name="Void Main()" attrs="150">
         <size>78</size>
       </method>
-      <method name="System.Double[][,] ReturnArray()" attrs="145">
-        <size>70</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Double[][,] ReturnArray()" attrs="145">
+        <size>70</size>
+      </method>
     </type>
   </test>
   <test name="test-685.cs">
@@ -44351,18 +44970,18 @@
   </test>
   <test name="test-692.cs">
     <type name="Test">
-      <method name="Void test1(DateTime ByRef)" attrs="145">
-        <size>11</size>
-      </method>
-      <method name="Void test2(DateTime ByRef)" attrs="145">
-        <size>14</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>169</size>
       </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Void test1(System.DateTime ByRef)" attrs="145">
+        <size>11</size>
+      </method>
+      <method name="Void test2(System.DateTime ByRef)" attrs="145">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="test-693.cs">
@@ -44745,9 +45364,6 @@
   </test>
   <test name="test-708.cs">
     <type name="A">
-      <method name="A+ADelegate Delegate2(Boolean)" attrs="150">
-        <size>50</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
@@ -44756,25 +45372,29 @@
       </method>
     </type>
     <type name="A+ADelegate">
-      <method name="A+ADelegate Invoke(Boolean)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Boolean, System.AsyncCallback, System.Object)" attrs="454">
+    </type>
+    <type name="A">
+      <method name="ADelegate Delegate2(Boolean)" attrs="150">
+        <size>50</size>
+      </method>
+    </type>
+    <type name="A+ADelegate">
+      <method name="ADelegate Invoke(Boolean)" attrs="454">
         <size>0</size>
       </method>
-      <method name="A+ADelegate EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(Boolean, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="ADelegate EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
   </test>
   <test name="test-709.cs">
     <type name="C">
-      <method name="Void CopyTo(Int32, System.Char[], Int32, Int32)" attrs="145">
-        <size>71</size>
-      </method>
       <method name="Void CharCopy(Char*, Char*, Int32)" attrs="145">
         <size>36</size>
       </method>
@@ -44784,6 +45404,9 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Void CopyTo(Int32, Char[], Int32, Int32)" attrs="145">
+        <size>71</size>
+      </method>
     </type>
   </test>
   <test name="test-71.cs">
@@ -44849,9 +45472,6 @@
       </method>
     </type>
     <type name="Foo">
-      <method name="IDisposable GetBar()" attrs="134">
-        <size>14</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -44870,6 +45490,11 @@
         <size>11</size>
       </method>
     </type>
+    <type name="Foo">
+      <method name="System.IDisposable GetBar()" attrs="134">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-714.cs">
     <type name="Hello">
@@ -45039,43 +45664,49 @@
       </method>
     </type>
     <type name="N.Parent">
-      <method name="Void add_Example(N.Parent+ExampleHandler)" attrs="3526">
+      <method name="Void .ctor()" attrs="6276">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="N.Parent+ExampleHandler">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void remove_Example(N.Parent+ExampleHandler)" attrs="3526">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void .ctor()" attrs="6276">
+    </type>
+    <type name="N.Child">
+      <method name="Void OnExample()" attrs="134">
+        <size>24</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
     </type>
-    <type name="N.Parent+ExampleHandler">
-      <method name="Void Invoke()" attrs="454">
+    <type name="N.Parent">
+      <method name="Void add_Example(ExampleHandler)" attrs="3526">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void remove_Example(ExampleHandler)" attrs="3526">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="N.Parent+ExampleHandler">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
     <type name="N.Child">
-      <method name="Void add_Example(N.Parent+ExampleHandler)" attrs="2246">
+      <method name="Void add_Example(ExampleHandler)" attrs="2246">
         <size>42</size>
       </method>
-      <method name="Void remove_Example(N.Parent+ExampleHandler)" attrs="2246">
+      <method name="Void remove_Example(ExampleHandler)" attrs="2246">
         <size>42</size>
       </method>
-      <method name="Void OnExample()" attrs="134">
-        <size>24</size>
-      </method>
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
-      </method>
     </type>
   </test>
   <test name="test-721.cs">
@@ -45159,12 +45790,6 @@
       <method name="Int32 Invoke(Int32 ByRef)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32 ByRef, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(Int32 ByRef, IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -45177,6 +45802,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(Int32 ByRef, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(Int32 ByRef, System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-726.cs">
     <type name="CS0102">
@@ -45285,13 +45918,13 @@
       <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -45386,12 +46019,6 @@
       </method>
     </type>
     <type name="TestGeneric2`1[T]">
-      <method name="Void add_Event(TestGeneric2`1+GenericHandler[T])" attrs="2182">
-        <size>42</size>
-      </method>
-      <method name="Void remove_Event(TestGeneric2`1+GenericHandler[T])" attrs="2182">
-        <size>42</size>
-      </method>
       <method name="Void Raise()" attrs="134">
         <size>22</size>
       </method>
@@ -45403,12 +46030,6 @@
       <method name="Void Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -45430,6 +46051,22 @@
         <size>7</size>
       </method>
     </type>
+    <type name="TestGeneric2`1[T]">
+      <method name="Void add_Event(GenericHandler)" attrs="2182">
+        <size>42</size>
+      </method>
+      <method name="Void remove_Event(GenericHandler)" attrs="2182">
+        <size>42</size>
+      </method>
+    </type>
+    <type name="TestGeneric2`1+GenericHandler[T]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-737.cs">
     <type name="Breaks">
@@ -45790,12 +46427,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -45830,6 +46461,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Bug.D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-755.cs">
     <type name="Item">
@@ -45985,9 +46624,6 @@
   </test>
   <test name="test-763.cs">
     <type name="StaticDelegateWithSameNameAsInstance">
-      <method name="Void set_MyProvider(StaticDelegateWithSameNameAsInstance+Provider)" attrs="2177">
-        <size>38</size>
-      </method>
       <method name="Void StaticCallback()" attrs="134">
         <size>49</size>
       </method>
@@ -46008,13 +46644,20 @@
       <method name="Void Invoke(System.String)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="StaticDelegateWithSameNameAsInstance">
+      <method name="Void set_MyProvider(Provider)" attrs="2177">
+        <size>38</size>
+      </method>
+    </type>
+    <type name="StaticDelegateWithSameNameAsInstance+Provider">
+      <method name="System.IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -46071,12 +46714,6 @@
   </test>
   <test name="test-766.cs">
     <type name="A.Color">
-      <method name="Color get_Base()" attrs="2180">
-        <size>14</size>
-      </method>
-      <method name="Color get_NewBase()" attrs="2180">
-        <size>15</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
@@ -46085,13 +46722,23 @@
       </method>
     </type>
     <type name="B.Color">
-      <method name="Color From(Int32)" attrs="150">
-        <size>18</size>
-      </method>
       <method name="Void .cctor()" attrs="6289">
         <size>15</size>
       </method>
     </type>
+    <type name="A.Color">
+      <method name="B.Color get_Base()" attrs="2180">
+        <size>14</size>
+      </method>
+      <method name="B.Color get_NewBase()" attrs="2180">
+        <size>15</size>
+      </method>
+    </type>
+    <type name="B.Color">
+      <method name="B.Color From(Int32)" attrs="150">
+        <size>18</size>
+      </method>
+    </type>
   </test>
   <test name="test-767.cs">
     <type name="Test">
@@ -46546,12 +47193,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -46584,6 +47225,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-782.cs">
     <type name="Test">
@@ -46865,9 +47514,6 @@
   </test>
   <test name="test-791.cs">
     <type name="testApp.TestApp">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>20</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>81</size>
       </method>
@@ -46877,6 +47523,9 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>20</size>
+      </method>
     </type>
   </test>
   <test name="test-792.cs">
@@ -47374,9 +48023,6 @@
   </test>
   <test name="test-82.cs">
     <type name="N1.N2.B">
-      <method name="Void Method(A ByRef)" attrs="129">
-        <size>2</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>10</size>
       </method>
@@ -47385,13 +48031,20 @@
       </method>
     </type>
     <type name="N1.N3.B">
-      <method name="Void Method(A ByRef)" attrs="129">
-        <size>2</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
     </type>
+    <type name="N1.N2.B">
+      <method name="Void Method(N1.A ByRef)" attrs="129">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="N1.N3.B">
+      <method name="Void Method(N1.A ByRef)" attrs="129">
+        <size>2</size>
+      </method>
+    </type>
   </test>
   <test name="test-820.cs">
     <type name="NS.C">
@@ -47550,6 +48203,9 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Void Test2(Boolean)" attrs="145">
+        <size>74</size>
+      </method>
     </type>
   </test>
   <test name="test-83.cs">
@@ -47557,12 +48213,6 @@
       <method name="Void Invoke(System.Object, PersonArrivedArgs)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, PersonArrivedArgs, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -47602,6 +48252,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="PersonArrivedHandler">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, PersonArrivedArgs, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-830.cs">
     <type name="MC">
@@ -47665,12 +48323,12 @@
       </method>
     </type>
     <type name="MainClass+DC">
-      <method name="Guid get_Id()" attrs="2182">
-        <size>15</size>
-      </method>
       <method name="Void .ctor(Guid)" attrs="6278">
         <size>9</size>
       </method>
+      <method name="System.Guid get_Id()" attrs="2182">
+        <size>15</size>
+      </method>
     </type>
   </test>
   <test name="test-834.cs">
@@ -48199,12 +48857,12 @@
       <method name="Int32 get_Foo()" attrs="2182">
         <size>14</size>
       </method>
-      <method name="Int32 op_Addition(op_Addition+Builder, op_Addition+Builder)" attrs="2198">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="Int32 op_Addition(Builder, Builder)" attrs="2198">
+        <size>10</size>
+      </method>
     </type>
   </test>
   <test name="test-863.cs">
@@ -48700,6 +49358,90 @@
       </method>
     </type>
   </test>
+  <test name="test-884.cs">
+    <type name="C">
+      <method name="Void Main()" attrs="145">
+        <size>6</size>
+      </method>
+      <method name="Void AddEH[T]()" attrs="145">
+        <size>25</size>
+      </method>
+      <method name="Void EHandler()" attrs="145">
+        <size>1</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="C+E`1[T]">
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="C+E`1+EMethod[T]">
+      <method name="Void Invoke()" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="C+E`1[T]">
+      <method name="Void add_EEvent(EMethod)" attrs="2182">
+        <size>42</size>
+      </method>
+      <method name="Void remove_EEvent(EMethod)" attrs="2182">
+        <size>42</size>
+      </method>
+    </type>
+    <type name="C+E`1+EMethod[T]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+  </test>
+  <test name="test-885.cs">
+    <type name="A">
+      <method name="Void .ctor(Double)" attrs="6278">
+        <size>15</size>
+      </method>
+    </type>
+    <type name="C">
+      <method name="Int32 Main()" attrs="145">
+        <size>92</size>
+      </method>
+      <method name="Boolean Foo(Double)" attrs="145">
+        <size>21</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
+  <test name="test-886.cs">
+    <type name="A">
+      <method name="A Get()" attrs="150">
+        <size>10</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="Test">
+      <method name="Void M()" attrs="129">
+        <size>8</size>
+      </method>
+      <method name="Void Main()" attrs="150">
+        <size>14</size>
+      </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+  </test>
   <test name="test-89.cs">
     <type name="X">
       <method name="X F(Int32)" attrs="145">
@@ -48792,9 +49534,6 @@
   </test>
   <test name="test-93.cs">
     <type name="N1.C">
-      <method name="Void method(B ByRef)" attrs="129">
-        <size>16</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -48807,6 +49546,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="N1.C">
+      <method name="Void method(N1.B ByRef)" attrs="129">
+        <size>16</size>
+      </method>
+    </type>
   </test>
   <test name="test-94.cs">
     <type name="Base">
@@ -48880,13 +49624,13 @@
       <method name="Void Invoke(System.Object, N1.A)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, N1.A, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, N1.A, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -48934,12 +49678,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -48960,16 +49698,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-02.cs">
     <type name="S">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-02.cs">
+    <type name="S">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -48992,16 +49732,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-03.cs">
     <type name="S">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-03.cs">
+    <type name="S">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -49024,16 +49766,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-04.cs">
     <type name="S">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-04.cs">
+    <type name="S">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -49056,16 +49800,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-05.cs">
     <type name="S">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-05.cs">
+    <type name="S">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -49096,16 +49842,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-06.cs">
     <type name="S">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-06.cs">
+    <type name="S">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -49128,16 +49876,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-07.cs">
-    <type name="D">
-      <method name="Void Invoke()" attrs="454">
+    <type name="S">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-07.cs">
+    <type name="D">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -49166,16 +49916,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-08.cs">
-    <type name="S">
-      <method name="Void Invoke()" attrs="454">
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-08.cs">
+    <type name="S">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -49198,6 +49950,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="S">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-09.cs">
     <type name="X">
@@ -49212,12 +49972,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -49230,6 +49984,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="X+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-10.cs">
     <type name="S">
@@ -49247,12 +50009,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -49270,6 +50026,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="S+T">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-100.cs">
     <type name="C">
@@ -49292,12 +50056,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -49324,16 +50082,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-102.cs">
-    <type name="Simple">
-      <method name="Void Invoke()" attrs="454">
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-102.cs">
+    <type name="Simple">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -49344,12 +50104,6 @@
       <method name="Simple Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Simple EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -49384,16 +50138,26 @@
         <size>51</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-103.cs">
-    <type name="Foo`1[S]">
-      <method name="Void Invoke(S)" attrs="454">
+    <type name="Simple">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(S, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Simple EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-103.cs">
+    <type name="Foo`1[S]">
+      <method name="Void Invoke(S)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -49417,6 +50181,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Foo`1[S]">
+      <method name="System.IAsyncResult BeginInvoke(S, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-104.cs">
     <type name="Test">
@@ -49437,9 +50209,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>76</size>
       </method>
@@ -49462,6 +50231,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="test-anon-105.cs">
@@ -49469,12 +50241,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -49505,9 +50271,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>113</size>
       </method>
@@ -49531,16 +50294,23 @@
         <size>52</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-106.cs">
-    <type name="Foo`2[R,S]">
-      <method name="Void Invoke(R, S)" attrs="454">
+    <type name="Hello">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(R, S, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Foo+&lt;Test&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+  </test>
+  <test name="test-anon-106.cs">
+    <type name="Foo`2[R,S]">
+      <method name="Void Invoke(R, S)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -49569,6 +50339,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Foo`2[R,S]">
+      <method name="System.IAsyncResult BeginInvoke(R, S, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-107.cs">
     <type name="MyDisposable">
@@ -49600,9 +50378,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>181</size>
       </method>
@@ -49628,6 +50403,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="test-anon-108.cs">
@@ -49635,12 +50413,6 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -49669,16 +50441,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-109.cs">
     <type name="Foo">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-109.cs">
+    <type name="Foo">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -49706,9 +50480,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>113</size>
       </method>
@@ -49729,9 +50500,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>72</size>
       </method>
@@ -49766,16 +50534,28 @@
         <size>26</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-11.cs">
-    <type name="D">
-      <method name="Void Invoke(Int32)" attrs="454">
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test+&lt;op_Addition&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="Test+&lt;&gt;c__Iterator1">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+  </test>
+  <test name="test-anon-11.cs">
+    <type name="D">
+      <method name="Void Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -49786,26 +50566,11 @@
       <method name="Void Invoke(Int32 ByRef)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32 ByRef, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(Int32 ByRef, IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
     <type name="F">
-      <method name="Void Invoke(System.Int32[])" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="IAsyncResult BeginInvoke(System.Int32[], System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -49820,14 +50585,43 @@
       <method name="Void &lt;Main&gt;m__1(Int32)" attrs="145">
         <size>2</size>
       </method>
-      <method name="Void &lt;Main&gt;m__2(System.Int32[])" attrs="145">
-        <size>2</size>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
       </method>
-      <method name="Void &lt;Main&gt;m__3(System.Int32[])" attrs="145">
+    </type>
+    <type name="E">
+      <method name="System.IAsyncResult BeginInvoke(Int32 ByRef, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(Int32 ByRef, System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="F">
+      <method name="Void Invoke(Int32[])" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.IAsyncResult BeginInvoke(Int32[], System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="X">
+      <method name="Void &lt;Main&gt;m__2(Int32[])" attrs="145">
         <size>2</size>
       </method>
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
+      <method name="Void &lt;Main&gt;m__3(Int32[])" attrs="145">
+        <size>2</size>
       </method>
     </type>
   </test>
@@ -49847,9 +50641,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>125</size>
       </method>
@@ -49872,6 +50663,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[T] System.Collections.Generic.IEnumerable&lt;T&gt;.GetEnumerator()" attrs="481">
         <size>52</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="test-anon-111.cs">
@@ -49879,12 +50673,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -49916,16 +50704,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-112.cs">
     <type name="Foo">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-112.cs">
+    <type name="Foo">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -49959,12 +50749,17 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-113.cs">
     <type name="X">
-      <method name="X+ModuleBinder`1[TDelegate] CreateMethodUnscoped[TDelegate]()" attrs="134">
-        <size>21</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
@@ -49979,13 +50774,20 @@
       <method name="T Invoke(System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="T EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="X">
+      <method name="ModuleBinder`1 CreateMethodUnscoped[TDelegate]()" attrs="134">
+        <size>21</size>
+      </method>
+    </type>
+    <type name="X+ModuleBinder`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="T EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -50014,12 +50816,6 @@
       <method name="Void Invoke(V)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(V, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -50028,12 +50824,6 @@
       <method name="Void Invoke(W)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(W, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -50070,16 +50860,26 @@
         <size>66</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-116.cs">
-    <type name="TestFunc`1[T]">
-      <method name="Void Invoke(T)" attrs="454">
+    <type name="Foo`1[V]">
+      <method name="System.IAsyncResult BeginInvoke(V, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="Bar`1[W]">
+      <method name="System.IAsyncResult BeginInvoke(W, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-116.cs">
+    <type name="TestFunc`1[T]">
+      <method name="Void Invoke(T)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -50105,12 +50905,17 @@
         <size>47</size>
       </method>
     </type>
+    <type name="TestFunc`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-117.cs">
     <type name="C">
-      <method name="Void Test[T,U](C+Func`1[T], U)" attrs="150">
-        <size>2</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>76</size>
       </method>
@@ -50128,25 +50933,26 @@
       <method name="T Invoke(T)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="T EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="C">
+      <method name="Void Test[T,U](Func`1, U)" attrs="150">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="C+Func`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(T, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="T EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
   </test>
   <test name="test-anon-118.cs">
     <type name="C">
-      <method name="TR Test[TR,TA](C+Func`2[TR,TA])" attrs="150">
-        <size>18</size>
-      </method>
-      <method name="TR Test[TR,TA,TB](C+Func`2[TR,TA], C+Func`2[TR,TB])" attrs="150">
-        <size>18</size>
-      </method>
       <method name="Void Test2[T]()" attrs="150">
         <size>20</size>
       </method>
@@ -50173,13 +50979,23 @@
       <method name="TR Invoke(TA)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(TA, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="TR EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="C">
+      <method name="TR Test[TR,TA](Func`2)" attrs="150">
+        <size>18</size>
+      </method>
+      <method name="TR Test[TR,TA,TB](Func`2, Func`2)" attrs="150">
+        <size>18</size>
+      </method>
+    </type>
+    <type name="C+Func`2[TR,TA]">
+      <method name="System.IAsyncResult BeginInvoke(TA, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="TR EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -50216,12 +51032,6 @@
       <method name="Boolean Invoke(System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Boolean EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -50240,6 +51050,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="predicate">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Boolean EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-120.cs">
     <type name="C`1[T]">
@@ -50270,12 +51088,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -50307,16 +51119,18 @@
         <size>61</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-122.cs">
-    <type name="D1">
-      <method name="Int32 Invoke()" attrs="454">
+    <type name="EmptyDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-122.cs">
+    <type name="D1">
+      <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -50327,12 +51141,6 @@
       <method name="Int64 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int64 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -50360,6 +51168,22 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D1">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="D2">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int64 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-123.cs">
     <type name="MemberAccessData">
@@ -50376,9 +51200,6 @@
       </method>
     </type>
     <type name="C">
-      <method name="Void Test(C+D)" attrs="145">
-        <size>2</size>
-      </method>
       <method name="Void Test(System.Action`1[E])" attrs="145">
         <size>9</size>
       </method>
@@ -50408,12 +51229,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -50450,6 +51265,19 @@
         <size>49</size>
       </method>
     </type>
+    <type name="C">
+      <method name="Void Test(D)" attrs="145">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="C+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-124.cs">
     <type name="Disposable`1[T]">
@@ -50740,9 +51568,6 @@
       <method name="T[] GetQueryObjects[T](System.String)" attrs="198">
         <size>71</size>
       </method>
-      <method name="Void ExecuteReader(Int32, MySqlDataObjectFactory+PerformActionWithReader)" attrs="145">
-        <size>2</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -50751,12 +51576,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -50777,6 +51596,19 @@
         <size>7</size>
       </method>
     </type>
+    <type name="MySqlDataObjectFactory">
+      <method name="Void ExecuteReader(Int32, PerformActionWithReader)" attrs="145">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="MySqlDataObjectFactory+PerformActionWithReader">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-128.cs">
     <type name="A">
@@ -50805,22 +51637,19 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
   </test>
   <test name="test-anon-129.cs">
     <type name="Test">
-      <method name="Boolean TryAction[T](Test+Creator`1[T], T ByRef)" attrs="145">
-        <size>25</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>16</size>
       </method>
@@ -50832,12 +51661,6 @@
       <method name="T Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="T EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -50860,17 +51683,22 @@
       <method name="T GetSingleItem[T](System.Collections.Generic.IList`1[T])" attrs="150">
         <size>18</size>
       </method>
+      <method name="Boolean TryAction[T](Creator`1, T ByRef)" attrs="145">
+        <size>25</size>
+      </method>
     </type>
-  </test>
-  <test name="test-anon-13.cs">
-    <type name="D">
-      <method name="Void Invoke()" attrs="454">
+    <type name="Test+Creator`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="T EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-13.cs">
+    <type name="D">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -50894,16 +51722,18 @@
         <size>15</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-130.cs">
-    <type name="Simple">
-      <method name="Void Invoke()" attrs="454">
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-130.cs">
+    <type name="Simple">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -50914,12 +51744,6 @@
       <method name="Simple Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Simple EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -50954,6 +51778,22 @@
         <size>51</size>
       </method>
     </type>
+    <type name="Simple">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Simple EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-131.cs">
     <type name="A">
@@ -51057,12 +51897,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -51075,6 +51909,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-135.cs">
     <type name="C`1[T]">
@@ -51128,12 +51970,6 @@
       <method name="Void Invoke(System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -51166,6 +52002,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Handler`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-137.cs">
     <type name="Wrap`1[U]">
@@ -51248,12 +52092,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -51291,15 +52129,17 @@
         <size>24</size>
       </method>
     </type>
+    <type name="Test+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-14.cs">
     <type name="X">
-      <method name="Void add_Click(X+T)" attrs="2193">
-        <size>40</size>
-      </method>
-      <method name="Void remove_Click(X+T)" attrs="2193">
-        <size>40</size>
-      </method>
       <method name="Void Method()" attrs="145">
         <size>2</size>
       </method>
@@ -51314,13 +52154,23 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="X">
+      <method name="Void add_Click(T)" attrs="2193">
+        <size>40</size>
+      </method>
+      <method name="Void remove_Click(T)" attrs="2193">
+        <size>40</size>
+      </method>
+    </type>
+    <type name="X+T">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -51335,12 +52185,6 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -51374,23 +52218,31 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test1.Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-141.cs">
     <type name="C">
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
-      <method name="Decimal &lt;Average`1&gt;m__0[TSource](Decimal, Decimal)" attrs="145">
-        <size>15</size>
-      </method>
-      <method name="Decimal &lt;Average`1&gt;m__1[TSource](Decimal, Decimal)" attrs="145">
-        <size>15</size>
+      <method name="TResult Average[TElement,TAggregate,TResult](System.Collections.Generic.IEnumerable`1[TElement], System.Func`3[TAggregate,TElement,TAggregate], System.Func`3[TAggregate,TElement,TResult])" attrs="145">
+        <size>7</size>
       </method>
-      <method name="Decimal Average[TSource](System.Collections.Generic.IEnumerable`1[TSource], System.Func`2[TSource,System.Decimal])" attrs="150">
+      <method name="System.Decimal Average[TSource](System.Collections.Generic.IEnumerable`1[TSource], System.Func`2[TSource,System.Decimal])" attrs="150">
         <size>45</size>
       </method>
-      <method name="TResult Average[TElement,TAggregate,TResult](System.Collections.Generic.IEnumerable`1[TElement], System.Func`3[TAggregate,TElement,TAggregate], System.Func`3[TAggregate,TElement,TResult])" attrs="145">
-        <size>7</size>
+      <method name="System.Decimal &lt;Average`1&gt;m__0[TSource](System.Decimal, System.Decimal)" attrs="145">
+        <size>15</size>
+      </method>
+      <method name="System.Decimal &lt;Average`1&gt;m__1[TSource](System.Decimal, System.Decimal)" attrs="145">
+        <size>15</size>
       </method>
     </type>
   </test>
@@ -51413,13 +52265,13 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -51565,12 +52417,6 @@
       <method name="TResult Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="TResult EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -51579,12 +52425,6 @@
       <method name="Void Invoke(T ByRef)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(T ByRef, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(T ByRef, IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -51623,6 +52463,22 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Func`1[TResult]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="TResult EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="GeneratorNext`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(T ByRef, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(T ByRef, System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-149.cs">
     <type name="Test">
@@ -51658,23 +52514,11 @@
       <method name="Void Main()" attrs="150">
         <size>44</size>
       </method>
-      <method name="Foo+Inner &lt;Main&gt;m__0(System.String)" attrs="145">
-        <size>21</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
     </type>
     <type name="Foo+foo_fn">
-      <method name="Foo+Inner Invoke(System.String)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Foo+Inner EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -51684,6 +52528,22 @@
         <size>8</size>
       </method>
     </type>
+    <type name="Foo">
+      <method name="Inner &lt;Main&gt;m__0(System.String)" attrs="145">
+        <size>21</size>
+      </method>
+    </type>
+    <type name="Foo+foo_fn">
+      <method name="Inner Invoke(System.String)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Inner EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-150.cs">
     <type name="M">
@@ -51695,9 +52555,6 @@
       </method>
     </type>
     <type name="SomeGenericClass`1[SomeType]">
-      <method name="Void Invoke(SomeGenericClass`1+SomeHandlerType[SomeType])" attrs="129">
-        <size>8</size>
-      </method>
       <method name="Void FailsToCompile()" attrs="134">
         <size>20</size>
       </method>
@@ -51712,12 +52569,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -51730,16 +52581,23 @@
         <size>19</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-151.cs">
-    <type name="Bla">
-      <method name="Void Invoke()" attrs="454">
+    <type name="SomeGenericClass`1[SomeType]">
+      <method name="Void Invoke(SomeHandlerType)" attrs="129">
+        <size>8</size>
+      </method>
+    </type>
+    <type name="SomeGenericClass`1+SomeHandlerType[SomeType]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-151.cs">
+    <type name="Bla">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -51768,6 +52626,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Bla">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-152.cs">
     <type name="A`1[T]">
@@ -51810,9 +52676,6 @@
       </method>
     </type>
     <type name="TestComp.Program+MyClass">
-      <method name="Void MyTemplate(TestComp.Program+MyClass+MyDelegate)" attrs="129">
-        <size>2</size>
-      </method>
       <method name="Void UseATemplate()" attrs="134">
         <size>37</size>
       </method>
@@ -51827,13 +52690,20 @@
       <method name="Void Invoke(System.Collections.Generic.List`1[System.Int32] ByRef)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Collections.Generic.List`1[System.Int32] ByRef, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(System.Collections.Generic.List`1[System.Int32] ByRef, IAsyncResult)" attrs="454">
+    </type>
+    <type name="TestComp.Program+MyClass">
+      <method name="Void MyTemplate(MyDelegate)" attrs="129">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="TestComp.Program+MyClass+MyDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.Collections.Generic.List`1[System.Int32] ByRef, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.Collections.Generic.List`1[System.Int32] ByRef, System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -51940,12 +52810,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -51958,16 +52822,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-157.cs">
-    <type name="Foo">
-      <method name="Void Invoke()" attrs="454">
+    <type name="C+DF">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-157.cs">
+    <type name="Foo">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -51993,6 +52859,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-158.cs">
     <type name="Test">
@@ -52076,12 +52950,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -52100,6 +52968,14 @@
         <size>15</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-160.cs">
     <type name="TestGenericsSubtypeMatching.Sender`1[T]">
@@ -52179,12 +53055,6 @@
       <method name="Void Invoke(System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -52227,6 +53097,14 @@
         <size>52</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-163.cs">
     <type name="A">
@@ -52449,9 +53327,6 @@
       </method>
     </type>
     <type name="Test">
-      <method name="Void Run(Test+RunDelegate)" attrs="134">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -52460,13 +53335,20 @@
       <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test">
+      <method name="Void Run(RunDelegate)" attrs="134">
+        <size>10</size>
+      </method>
+    </type>
+    <type name="Test+RunDelegate">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -52499,12 +53381,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -52537,6 +53413,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="ClickEvent">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-170.cs">
     <type name="MyClass">
@@ -52663,12 +53547,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -52689,16 +53567,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-19.cs">
-    <type name="S">
-      <method name="Void Invoke()" attrs="454">
+    <type name="A">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-19.cs">
+    <type name="S">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -52729,16 +53609,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-20.cs">
-    <type name="D">
-      <method name="Void Invoke()" attrs="454">
+    <type name="S">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-20.cs">
+    <type name="D">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -52772,16 +53654,18 @@
         <size>53</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-21.cs">
     <type name="D">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-21.cs">
+    <type name="D">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -52818,16 +53702,18 @@
         <size>82</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-22.cs">
     <type name="D">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-22.cs">
+    <type name="D">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -52861,16 +53747,18 @@
         <size>53</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-23.cs">
     <type name="D">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-23.cs">
+    <type name="D">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -52904,16 +53792,18 @@
         <size>25</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-24.cs">
     <type name="D">
-      <method name="Int32 Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-24.cs">
+    <type name="D">
+      <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -52939,16 +53829,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-25.cs">
     <type name="D">
-      <method name="Int32 Invoke(Int32)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-25.cs">
+    <type name="D">
+      <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -52974,15 +53866,20 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-26.cs">
     <type name="TestGotoLabels.GotoLabelsTest">
       <method name="Int32 Main()" attrs="150">
         <size>44</size>
       </method>
-      <method name="Void TestMethod2(TestGotoLabels.GotoLabelsTest+MyDelegate)" attrs="150">
-        <size>8</size>
-      </method>
       <method name="Void &lt;Main&gt;m__0()" attrs="145">
         <size>12</size>
       </method>
@@ -52994,13 +53891,20 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="TestGotoLabels.GotoLabelsTest">
+      <method name="Void TestMethod2(MyDelegate)" attrs="150">
+        <size>8</size>
+      </method>
+    </type>
+    <type name="TestGotoLabels.GotoLabelsTest+MyDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -53010,12 +53914,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -53047,6 +53945,14 @@
         <size>51</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-28.cs">
     <type name="Delegable">
@@ -53102,27 +54008,31 @@
       <method name="System.String Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="System.String EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="X+Bar">
+      <method name="Void Invoke(System.String)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
-    <type name="X+Bar">
-      <method name="Void Invoke(System.String)" attrs="454">
+    <type name="X+Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="System.String EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="X+Bar">
+      <method name="System.IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -53134,12 +54044,6 @@
       </method>
     </type>
     <type name="Program">
-      <method name="Void add_E(Program+D)" attrs="2193">
-        <size>40</size>
-      </method>
-      <method name="Void remove_E(Program+D)" attrs="2193">
-        <size>40</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>39</size>
       </method>
@@ -53148,12 +54052,6 @@
       <method name="Void Invoke(X)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(X, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -53166,15 +54064,28 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Program">
+      <method name="Void add_E(D)" attrs="2193">
+        <size>40</size>
+      </method>
+      <method name="Void remove_E(D)" attrs="2193">
+        <size>40</size>
+      </method>
+    </type>
+    <type name="Program+D">
+      <method name="System.IAsyncResult BeginInvoke(X, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-31.cs">
     <type name="X">
       <method name="Void Main()" attrs="150">
         <size>36</size>
       </method>
-      <method name="Void DoCall(X+test)" attrs="145">
-        <size>2</size>
-      </method>
       <method name="System.Object &lt;Main&gt;m__0(System.Reflection.MethodInfo)" attrs="145">
         <size>26</size>
       </method>
@@ -53186,13 +54097,20 @@
       <method name="System.Object Invoke(System.Reflection.MethodInfo)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Reflection.MethodInfo, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="System.Object EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="X">
+      <method name="Void DoCall(test)" attrs="145">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="X+test">
+      <method name="System.IAsyncResult BeginInvoke(System.Reflection.MethodInfo, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="System.Object EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -53202,12 +54120,6 @@
       <method name="Void Invoke(System.String)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -53216,12 +54128,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -53248,16 +54154,26 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-33.cs">
-    <type name="Do">
-      <method name="Void Invoke()" attrs="454">
+    <type name="StringSender">
+      <method name="System.IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="VoidDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+  </test>
+  <test name="test-anon-33.cs">
+    <type name="Do">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -53291,6 +54207,14 @@
         <size>13</size>
       </method>
     </type>
+    <type name="Do">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-34.cs">
     <type name="Delegates.Space">
@@ -53305,12 +54229,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -53344,15 +54262,20 @@
         <size>20</size>
       </method>
     </type>
+    <type name="Delegates.Space+DoCopy">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-35.cs">
     <type name="ExceptionWithAnonMethod">
       <method name="Int32 Main()" attrs="150">
         <size>108</size>
       </method>
-      <method name="Void AnonHandler(ExceptionWithAnonMethod+EmptyCallback)" attrs="150">
-        <size>16</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -53361,12 +54284,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -53379,6 +54296,19 @@
         <size>7</size>
       </method>
     </type>
+    <type name="ExceptionWithAnonMethod">
+      <method name="Void AnonHandler(EmptyCallback)" attrs="150">
+        <size>16</size>
+      </method>
+    </type>
+    <type name="ExceptionWithAnonMethod+EmptyCallback">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-36.cs">
     <type name="Test">
@@ -53399,27 +54329,31 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="TestMethod2">
+      <method name="Void Invoke(System.Object)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
-    <type name="TestMethod2">
-      <method name="Void Invoke(System.Object)" attrs="454">
+    <type name="TestMethod">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="TestMethod2">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -53443,13 +54377,13 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -53459,12 +54393,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -53473,12 +54401,6 @@
       <method name="Simple Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Simple EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -53513,30 +54435,34 @@
         <size>35</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-39.cs">
     <type name="Simple">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Simple EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Foo">
-      <method name="Simple Invoke()" attrs="454">
+  </test>
+  <test name="test-anon-39.cs">
+    <type name="Simple">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Simple EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Foo">
+      <method name="Simple Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -53568,30 +54494,34 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-40.cs">
     <type name="Simple">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Simple EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Foo">
-      <method name="Simple Invoke()" attrs="454">
+  </test>
+  <test name="test-anon-40.cs">
+    <type name="Simple">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Simple EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Foo">
+      <method name="Simple Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -53623,30 +54553,34 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-41.cs">
     <type name="Simple">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Simple EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Foo">
-      <method name="Simple Invoke()" attrs="454">
+  </test>
+  <test name="test-anon-41.cs">
+    <type name="Simple">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Simple EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Foo">
+      <method name="Simple Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -53683,30 +54617,34 @@
         <size>36</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-42.cs">
     <type name="Simple">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Simple EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Foo">
-      <method name="Simple Invoke()" attrs="454">
+  </test>
+  <test name="test-anon-42.cs">
+    <type name="Simple">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Simple EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Foo">
+      <method name="Simple Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -53733,30 +54671,34 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-43.cs">
     <type name="Simple">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Simple EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Foo">
-      <method name="Simple Invoke()" attrs="454">
+  </test>
+  <test name="test-anon-43.cs">
+    <type name="Simple">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Simple EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Foo">
+      <method name="Simple Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -53793,30 +54735,34 @@
         <size>35</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-44.cs">
     <type name="Simple">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Simple EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="Foo">
-      <method name="Simple Invoke()" attrs="454">
+  </test>
+  <test name="test-anon-44.cs">
+    <type name="Simple">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Simple EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Foo">
+      <method name="Simple Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -53863,16 +54809,26 @@
         <size>27</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-45.cs">
-    <type name="TestFunc">
-      <method name="Void Invoke(Int32)" attrs="454">
+    <type name="Simple">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+    </type>
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Simple EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-45.cs">
+    <type name="TestFunc">
+      <method name="Void Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -53898,16 +54854,18 @@
         <size>46</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-46.cs">
-    <type name="Foo">
-      <method name="Void Invoke()" attrs="454">
+    <type name="TestFunc">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-46.cs">
+    <type name="Foo">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -53941,16 +54899,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-47.cs">
     <type name="Foo">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-47.cs">
+    <type name="Foo">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -53994,16 +54954,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-48.cs">
     <type name="Foo">
-      <method name="Void Invoke()" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-48.cs">
+    <type name="Foo">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -54047,15 +55009,20 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-49.cs">
     <type name="Test">
       <method name="Void Main()" attrs="150">
         <size>68</size>
       </method>
-      <method name="IEnumerator GetEnumerator()" attrs="134">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -54080,12 +55047,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test">
+      <method name="System.Collections.IEnumerator GetEnumerator()" attrs="134">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-50.cs">
     <type name="Test">
-      <method name="IEnumerable Foo(Int32)" attrs="134">
-        <size>30</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -54105,9 +55074,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>135</size>
       </method>
@@ -54124,18 +55090,22 @@
         <size>40</size>
       </method>
     </type>
+    <type name="Test">
+      <method name="System.Collections.IEnumerable Foo(Int32)" attrs="134">
+        <size>30</size>
+      </method>
+    </type>
+    <type name="Test+&lt;Foo&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-51.cs">
     <type name="FooDelegate">
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -54154,12 +55124,17 @@
         <size>35</size>
       </method>
     </type>
+    <type name="FooDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-52.cs">
     <type name="X">
-      <method name="IEnumerator GetIt(System.Int32[])" attrs="145">
-        <size>22</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>40</size>
       </method>
@@ -54171,12 +55146,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -54209,16 +55178,23 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-53.cs">
-    <type name="Foo">
-      <method name="Void Invoke()" attrs="454">
+    <type name="X">
+      <method name="System.Collections.IEnumerator GetIt(Int32[])" attrs="145">
+        <size>22</size>
+      </method>
+    </type>
+    <type name="X+A">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-53.cs">
+    <type name="Foo">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -54257,16 +55233,18 @@
         <size>13</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-54.cs">
-    <type name="Hello">
-      <method name="Void Invoke()" attrs="454">
+    <type name="Foo">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-54.cs">
+    <type name="Hello">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -54303,12 +55281,17 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Hello">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-55.cs">
     <type name="Foo">
-      <method name="Void Test(Foo+Hello)" attrs="132">
-        <size>8</size>
-      </method>
       <method name="Void Private()" attrs="129">
         <size>12</size>
       </method>
@@ -54326,12 +55309,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -54344,16 +55321,23 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-56.cs">
-    <type name="QueueHandler">
-      <method name="Void Invoke(Observable)" attrs="454">
+    <type name="Foo">
+      <method name="Void Test(Hello)" attrs="132">
+        <size>8</size>
+      </method>
+    </type>
+    <type name="Foo+Hello">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Observable, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-56.cs">
+    <type name="QueueHandler">
+      <method name="Void Invoke(Observable)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -54371,6 +55355,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="QueueHandler">
+      <method name="System.IAsyncResult BeginInvoke(Observable, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-57.cs">
     <type name="X">
@@ -54388,12 +55380,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -54411,6 +55397,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="X+TestDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-58.cs">
     <type name="X">
@@ -54428,12 +55422,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -54456,6 +55444,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="X+TestDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-59.cs">
     <type name="X">
@@ -54473,12 +55469,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -54506,6 +55496,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="X+TestDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-60.cs">
     <type name="X">
@@ -54523,12 +55521,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -54564,6 +55556,14 @@
         <size>125</size>
       </method>
     </type>
+    <type name="X+TestDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-61.cs">
     <type name="X">
@@ -54581,12 +55581,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -54604,16 +55598,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-62.cs">
-    <type name="FooHandler">
-      <method name="Void Invoke()" attrs="454">
+    <type name="X+TestDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-62.cs">
+    <type name="FooHandler">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -54649,12 +55645,17 @@
         <size>7</size>
       </method>
     </type>
+    <type name="FooHandler">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-63.cs">
     <type name="X">
-      <method name="IEnumerator GetIt(System.Int32[])" attrs="145">
-        <size>22</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>40</size>
       </method>
@@ -54666,12 +55667,6 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -54709,6 +55704,19 @@
         <size>7</size>
       </method>
     </type>
+    <type name="X">
+      <method name="System.Collections.IEnumerator GetIt(Int32[])" attrs="145">
+        <size>22</size>
+      </method>
+    </type>
+    <type name="X+A">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-64.cs">
     <type name="Source">
@@ -54761,12 +55769,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -54787,21 +55789,17 @@
         <size>7</size>
       </method>
     </type>
+    <type name="BaseClass+SomeDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-66.cs">
     <type name="Test">
-      <method name="Void add_testEvent(Test+TestEventHandler)" attrs="2182">
-        <size>42</size>
-      </method>
-      <method name="Void remove_testEvent(Test+TestEventHandler)" attrs="2182">
-        <size>42</size>
-      </method>
-      <method name="Void add_TestEvent(Test+TestEventHandler)" attrs="2182">
-        <size>34</size>
-      </method>
-      <method name="Void remove_TestEvent(Test+TestEventHandler)" attrs="2182">
-        <size>2</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
@@ -54813,12 +55811,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -54831,6 +55823,28 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test">
+      <method name="Void add_testEvent(TestEventHandler)" attrs="2182">
+        <size>42</size>
+      </method>
+      <method name="Void remove_testEvent(TestEventHandler)" attrs="2182">
+        <size>42</size>
+      </method>
+      <method name="Void add_TestEvent(TestEventHandler)" attrs="2182">
+        <size>34</size>
+      </method>
+      <method name="Void remove_TestEvent(TestEventHandler)" attrs="2182">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="Test+TestEventHandler">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-67.cs">
     <type name="ClassOne">
@@ -54848,12 +55862,6 @@
       <method name="System.String Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="System.String EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -54866,16 +55874,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-68.cs">
-    <type name="D1">
-      <method name="Void Invoke(Int32)" attrs="454">
+    <type name="ClassOne+ReturnStringDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="System.String EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-68.cs">
+    <type name="D1">
+      <method name="Void Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -54886,12 +55896,6 @@
       <method name="Void Invoke(System.String ByRef)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.String ByRef, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(System.String ByRef, IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -54916,16 +55920,26 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-69.cs">
-    <type name="TargetAccessDelegate">
-      <method name="System.Object Invoke(System.Object)" attrs="454">
+    <type name="D1">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+    </type>
+    <type name="D2">
+      <method name="System.IAsyncResult BeginInvoke(System.String ByRef, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="System.Object EndInvoke(IAsyncResult)" attrs="454">
+      <method name="Void EndInvoke(System.String ByRef, System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+  </test>
+  <test name="test-anon-69.cs">
+    <type name="TargetAccessDelegate">
+      <method name="System.Object Invoke(System.Object)" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -54954,6 +55968,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="TargetAccessDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.Object EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-70.cs">
     <type name="UnsafeClass">
@@ -54965,9 +55987,6 @@
       </method>
     </type>
     <type name="C">
-      <method name="Void Test(C+D)" attrs="145">
-        <size>2</size>
-      </method>
       <method name="Void UnsafeTests()" attrs="145">
         <size>36</size>
       </method>
@@ -54982,12 +56001,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -55018,15 +56031,22 @@
         <size>49</size>
       </method>
     </type>
+    <type name="C">
+      <method name="Void Test(D)" attrs="145">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="C+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-71.cs">
     <type name="Program">
-      <method name="Errno ProcessFile(System.String, Program+FdCb)" attrs="145">
-        <size>10</size>
-      </method>
-      <method name="Errno OnReadHandle(System.String, System.Byte[], Int64)" attrs="132">
-        <size>42</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
@@ -55038,12 +56058,6 @@
       <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -55056,12 +56070,25 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Program">
+      <method name="Errno ProcessFile(System.String, FdCb)" attrs="145">
+        <size>10</size>
+      </method>
+      <method name="Errno OnReadHandle(System.String, Byte[], Int64)" attrs="132">
+        <size>42</size>
+      </method>
+    </type>
+    <type name="Program+FdCb">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-72.cs">
     <type name="Test">
-      <method name="Void AddOperator(Test+UnaryOperator)" attrs="134">
-        <size>2</size>
-      </method>
       <method name="Boolean TryGetValue(System.Object, System.Object ByRef)" attrs="134">
         <size>13</size>
       </method>
@@ -55082,13 +56109,20 @@
       <method name="Boolean Invoke(System.Object, System.Object ByRef)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.Object ByRef, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Boolean EndInvoke(System.Object ByRef, IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test">
+      <method name="Void AddOperator(UnaryOperator)" attrs="134">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="Test+UnaryOperator">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.Object ByRef, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Boolean EndInvoke(System.Object ByRef, System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -55098,12 +56132,6 @@
       <method name="Void Invoke(System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -55125,12 +56153,17 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.Object, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-74.cs">
     <type name="Foo">
-      <method name="Void Baz(Foo+SimpleDelegate)" attrs="145">
-        <size>9</size>
-      </method>
       <method name="Void Main(System.String[])" attrs="150">
         <size>36</size>
       </method>
@@ -55142,13 +56175,20 @@
       <method name="System.String[,] Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="System.String[,] EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Foo">
+      <method name="Void Baz(SimpleDelegate)" attrs="145">
+        <size>9</size>
+      </method>
+    </type>
+    <type name="Foo+SimpleDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="System.String[,] EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -55158,12 +56198,6 @@
       <method name="Boolean Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Boolean EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -55206,16 +56240,18 @@
         <size>67</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-76.cs">
-    <type name="FactoryDelegate">
-      <method name="System.Object Invoke()" attrs="454">
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Boolean EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="System.Object EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-76.cs">
+    <type name="FactoryDelegate">
+      <method name="System.Object Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -55242,16 +56278,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-77.cs">
-    <type name="D">
-      <method name="Void Invoke()" attrs="454">
+    <type name="FactoryDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="System.Object EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-77.cs">
+    <type name="D">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -55280,16 +56318,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-78.cs">
-    <type name="D1">
-      <method name="Void Invoke()" attrs="454">
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-78.cs">
+    <type name="D1">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -55300,12 +56340,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -55330,21 +56364,25 @@
         <size>8</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-79.cs">
-    <type name="Test">
-      <method name="Void add_E(Test+D)" attrs="2177">
-        <size>42</size>
+    <type name="D1">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
       </method>
-      <method name="Void remove_E(Test+D)" attrs="2177">
-        <size>42</size>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
       </method>
-      <method name="Void add_Changed(Test+D)" attrs="2177">
-        <size>31</size>
+    </type>
+    <type name="D2">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
       </method>
-      <method name="Void remove_Changed(Test+D)" attrs="2177">
-        <size>2</size>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
       </method>
+    </type>
+  </test>
+  <test name="test-anon-79.cs">
+    <type name="Test">
       <method name="Void Foo()" attrs="129">
         <size>2</size>
       </method>
@@ -55362,13 +56400,29 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="Test">
+      <method name="Void add_E(D)" attrs="2177">
+        <size>42</size>
+      </method>
+      <method name="Void remove_E(D)" attrs="2177">
+        <size>42</size>
+      </method>
+      <method name="Void add_Changed(D)" attrs="2177">
+        <size>31</size>
+      </method>
+      <method name="Void remove_Changed(D)" attrs="2177">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="Test+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -55414,12 +56468,6 @@
       <method name="Int32 Test()" attrs="129">
         <size>35</size>
       </method>
-      <method name="Int32 Foo2(C+Cmd2)" attrs="129">
-        <size>15</size>
-      </method>
-      <method name="Void Foo(C+Cmd)" attrs="129">
-        <size>8</size>
-      </method>
       <method name="Int32 &lt;Test&gt;m__0()" attrs="129">
         <size>53</size>
       </method>
@@ -55431,12 +56479,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -55445,12 +56487,6 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -55475,30 +56511,42 @@
         <size>19</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-82.cs">
-    <type name="StringSender">
-      <method name="Void Invoke(System.String)" attrs="454">
+    <type name="C">
+      <method name="Int32 Foo2(Cmd2)" attrs="129">
+        <size>15</size>
+      </method>
+      <method name="Void Foo(Cmd)" attrs="129">
+        <size>8</size>
+      </method>
+    </type>
+    <type name="C+Cmd">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="C+Cmd2">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
-    <type name="VoidDelegate">
-      <method name="Void Invoke()" attrs="454">
+  </test>
+  <test name="test-anon-82.cs">
+    <type name="StringSender">
+      <method name="Void Invoke(System.String)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+    <type name="VoidDelegate">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -55532,12 +56580,6 @@
       <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -55615,6 +56657,30 @@
         <size>9</size>
       </method>
     </type>
+    <type name="StringSender">
+      <method name="System.IAsyncResult BeginInvoke(System.String, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="VoidDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="MainClass+D">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-83.cs">
     <type name="C">
@@ -55643,12 +56709,6 @@
       <method name="C Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="C EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -55667,6 +56727,14 @@
         <size>43</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="C EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-85.cs">
     <type name="X">
@@ -55681,12 +56749,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -55699,6 +56761,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="X+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-86.cs">
     <type name="Bug.A">
@@ -55724,12 +56794,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -55742,16 +56806,18 @@
         <size>7</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-87.cs">
-    <type name="Bug.D">
-      <method name="Void Invoke()" attrs="454">
+    <type name="Bug.EventHandler">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-87.cs">
+    <type name="Bug.D">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -55785,6 +56851,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Bug.D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-88.cs">
     <type name="C">
@@ -55802,12 +56876,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -55848,6 +56916,14 @@
         <size>21</size>
       </method>
     </type>
+    <type name="C+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-89.cs">
     <type name="C">
@@ -55860,9 +56936,6 @@
       <method name="Void set_GdkWindow(System.Object)" attrs="2177">
         <size>2</size>
       </method>
-      <method name="Void Invoke(C+D)" attrs="150">
-        <size>2</size>
-      </method>
       <method name="Void Test()" attrs="129">
         <size>74</size>
       </method>
@@ -55874,12 +56947,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -55910,6 +56977,19 @@
         <size>19</size>
       </method>
     </type>
+    <type name="C">
+      <method name="Void Invoke(D)" attrs="150">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="C+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-90.cs">
     <type name="C">
@@ -55927,12 +57007,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -55958,6 +57032,14 @@
         <size>33</size>
       </method>
     </type>
+    <type name="C+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-91.cs">
     <type name="A">
@@ -55983,12 +57065,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -56009,16 +57085,18 @@
         <size>24</size>
       </method>
     </type>
-  </test>
-  <test name="test-anon-92.cs">
-    <type name="D">
-      <method name="Void Invoke()" attrs="454">
+    <type name="C+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
+    </type>
+  </test>
+  <test name="test-anon-92.cs">
+    <type name="D">
+      <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
@@ -56026,9 +57104,6 @@
       </method>
     </type>
     <type name="MainClass">
-      <method name="Void Test(IEnumerable)" attrs="145">
-        <size>34</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>29</size>
       </method>
@@ -56044,6 +57119,19 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="MainClass">
+      <method name="Void Test(System.Collections.IEnumerable)" attrs="145">
+        <size>34</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-93.cs">
     <type name="BaseTest.MainClass">
@@ -56163,12 +57251,6 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -56223,6 +57305,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-96.cs">
     <type name="P">
@@ -56234,9 +57324,6 @@
       <method name="Int32 Extra()" attrs="145">
         <size>11</size>
       </method>
-      <method name="Program+D Get(Int32)" attrs="145">
-        <size>146</size>
-      </method>
       <method name="Int32 Run(Int32)" attrs="145">
         <size>20</size>
       </method>
@@ -56248,12 +57335,6 @@
       <method name="Int32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -56277,6 +57358,19 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Program">
+      <method name="D Get(Int32)" attrs="145">
+        <size>146</size>
+      </method>
+    </type>
+    <type name="Program+D">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-97.cs">
     <type name="Space">
@@ -56291,12 +57385,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -56325,6 +57413,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Space+DoCopy">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-anon-98.cs">
     <type name="Foo">
@@ -56413,7 +57509,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>221</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -56464,17 +57560,17 @@
       </method>
     </type>
     <type name="C+&lt;TestTask&gt;c__async0">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
     <type name="C+&lt;TestTask2&gt;c__async1">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
     <type name="C+&lt;TestTaskGeneric&gt;c__async2">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -56529,17 +57625,17 @@
       </method>
     </type>
     <type name="A+&lt;Test1&gt;c__async0">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
     <type name="A+&lt;Test2&gt;c__async1">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
     <type name="A+&lt;Test3&gt;c__async2">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -56560,15 +57656,17 @@
       <method name="Void MoveNext()" attrs="486">
         <size>196</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="C">
       <method name="Int32 &lt;TestTaskGeneric&gt;m__0()" attrs="129">
         <size>39</size>
       </method>
     </type>
+    <type name="C+&lt;TestTaskGeneric&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-05.cs">
     <type name="C">
@@ -56589,7 +57687,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>49</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -56613,9 +57711,6 @@
       <method name="System.Threading.Tasks.Task`1[System.String] &lt;&gt;m__2(System.String)" attrs="131">
         <size>49</size>
       </method>
-      <method name="System.Threading.Tasks.Task`1[System.Decimal] &lt;&gt;m__3(Decimal)" attrs="131">
-        <size>49</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -56635,21 +57730,6 @@
         <size>251</size>
       </method>
     </type>
-    <type name="Program+&lt;Main&gt;c__AnonStorey1+&lt;Main&gt;c__async0">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Program+&lt;Main&gt;c__AnonStorey1+&lt;Main&gt;c__async2">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Program+&lt;Main&gt;c__AnonStorey1+&lt;Main&gt;c__async3">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
     <type name="Program+&lt;Main&gt;c__AnonStorey1">
       <method name="Void &lt;&gt;m__5()" attrs="131">
         <size>34</size>
@@ -56659,9 +57739,6 @@
       <method name="Void MoveNext()" attrs="486">
         <size>251</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Program+&lt;Main&gt;c__AnonStorey1+&lt;Main&gt;c__async3+&lt;Main&gt;c__AnonStorey4">
       <method name="Void .ctor()" attrs="6278">
@@ -56677,14 +57754,6 @@
       <method name="Void MoveNext()" attrs="486">
         <size>44</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Program">
-      <method name="System.Threading.Tasks.Task`1[System.Decimal] &lt;Main&gt;m__0(Decimal)" attrs="145">
-        <size>41</size>
-      </method>
     </type>
     <type name="Program+&lt;Main&gt;c__AnonStorey1">
       <method name="Void &lt;&gt;m__4()" attrs="131">
@@ -56696,11 +57765,46 @@
         <size>52</size>
       </method>
     </type>
+    <type name="Program">
+      <method name="System.Threading.Tasks.Task`1[System.Decimal] &lt;Main&gt;m__0(System.Decimal)" attrs="145">
+        <size>41</size>
+      </method>
+    </type>
+    <type name="Program+&lt;Main&gt;c__AnonStorey1">
+      <method name="System.Threading.Tasks.Task`1[System.Decimal] &lt;&gt;m__3(System.Decimal)" attrs="131">
+        <size>49</size>
+      </method>
+    </type>
+    <type name="Program+&lt;Main&gt;c__AnonStorey1+&lt;Main&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Program+&lt;Main&gt;c__AnonStorey1+&lt;Main&gt;c__async2">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Program+&lt;Main&gt;c__AnonStorey1+&lt;Main&gt;c__async3">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Program+&lt;Main&gt;c__AnonStorey1+&lt;Main&gt;c__async5">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
     <type name="Program+&lt;Main&gt;c__AnonStorey1+&lt;Main&gt;c__async5+&lt;Main&gt;c__AnonStorey6">
-      <method name="Decimal &lt;&gt;m__0()" attrs="131">
+      <method name="System.Decimal &lt;&gt;m__0()" attrs="131">
         <size>52</size>
       </method>
     </type>
+    <type name="Program+&lt;Main&gt;c__async7">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-07.cs">
     <type name="Program">
@@ -56729,25 +57833,16 @@
       <method name="Void MoveNext()" attrs="486">
         <size>238</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Program+&lt;Main&gt;c__AnonStorey1+&lt;Main&gt;c__async3">
       <method name="Void MoveNext()" attrs="486">
         <size>191</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Program+&lt;Main&gt;c__AnonStorey1+&lt;Main&gt;c__async5">
       <method name="Void MoveNext()" attrs="486">
         <size>191</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Program+&lt;Main&gt;c__AnonStorey1+&lt;Main&gt;c__async0+&lt;Main&gt;c__AnonStorey2">
       <method name="Void .ctor()" attrs="6278">
@@ -56758,9 +57853,6 @@
       <method name="Void MoveNext()" attrs="486">
         <size>43</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Program">
       <method name="System.Threading.Tasks.Task`1[System.Int16] &lt;Main&gt;m__0(Int16)" attrs="145">
@@ -56780,6 +57872,26 @@
         <size>52</size>
       </method>
     </type>
+    <type name="Program+&lt;Main&gt;c__AnonStorey1+&lt;Main&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Program+&lt;Main&gt;c__AnonStorey1+&lt;Main&gt;c__async3">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Program+&lt;Main&gt;c__AnonStorey1+&lt;Main&gt;c__async5">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Program+&lt;Main&gt;c__async4">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-08.cs">
     <type name="AsyncTypeInference">
@@ -56835,33 +57947,33 @@
       </method>
     </type>
     <type name="AsyncTypeInference+&lt;Main&gt;c__async2">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
+      <method name="Int32 &lt;&gt;m__0()" attrs="145">
+        <size>9</size>
       </method>
     </type>
     <type name="AsyncTypeInference+&lt;Main&gt;c__async5">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
+      <method name="Int32 &lt;&gt;m__0()" attrs="145">
+        <size>9</size>
       </method>
     </type>
-    <type name="AsyncTypeInference+&lt;Main&gt;c__async8">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+    <type name="AsyncTypeInference+&lt;Main&gt;c__async2">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
-    <type name="AsyncTypeInference+&lt;Main&gt;c__asyncB">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+    <type name="AsyncTypeInference+&lt;Main&gt;c__async5">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
-    <type name="AsyncTypeInference+&lt;Main&gt;c__async2">
-      <method name="Int32 &lt;&gt;m__0()" attrs="145">
-        <size>9</size>
+    <type name="AsyncTypeInference+&lt;Main&gt;c__async8">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
       </method>
     </type>
-    <type name="AsyncTypeInference+&lt;Main&gt;c__async5">
-      <method name="Int32 &lt;&gt;m__0()" attrs="145">
-        <size>9</size>
+    <type name="AsyncTypeInference+&lt;Main&gt;c__asyncB">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
       </method>
     </type>
   </test>
@@ -56887,7 +57999,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>38</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -56971,41 +58083,6 @@
         <size>7</size>
       </method>
     </type>
-    <type name="C+&lt;TestCompositionCall_1&gt;c__async0">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="C+&lt;TestCompositionCall_2&gt;c__async1">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="C+&lt;TestCompositionCall_3&gt;c__async2">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="C+&lt;TestCompositionPair_1&gt;c__async3">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="C+&lt;TestCompositionPair_2&gt;c__async4">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="C+&lt;TestCompositionPair_3&gt;c__async5">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="C+&lt;TestCompositionPair_4&gt;c__async6">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
     <type name="C+&lt;TestCompositionCall_1&gt;c__async0">
       <method name="System.String &lt;&gt;m__0()" attrs="145">
         <size>21</size>
@@ -57050,6 +58127,41 @@
         <size>9</size>
       </method>
     </type>
+    <type name="C+&lt;TestCompositionCall_1&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;TestCompositionCall_2&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;TestCompositionCall_3&gt;c__async2">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;TestCompositionPair_1&gt;c__async3">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;TestCompositionPair_2&gt;c__async4">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;TestCompositionPair_3&gt;c__async5">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;TestCompositionPair_4&gt;c__async6">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-11.cs">
     <type name="G`1[T]">
@@ -57111,17 +58223,11 @@
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>9</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="C+&lt;TestStack_1&gt;c__async0">
       <method name="Void MoveNext()" attrs="486">
         <size>327</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>9</size>
       </method>
@@ -57130,9 +58236,6 @@
       <method name="Void MoveNext()" attrs="486">
         <size>302</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>9</size>
       </method>
@@ -57141,9 +58244,6 @@
       <method name="Void MoveNext()" attrs="486">
         <size>467</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>9</size>
       </method>
@@ -57152,9 +58252,6 @@
       <method name="Void MoveNext()" attrs="486">
         <size>323</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>9</size>
       </method>
@@ -57163,9 +58260,6 @@
       <method name="Void MoveNext()" attrs="486">
         <size>347</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="C+&lt;TestStack_5&gt;c__async4+&lt;TestStack_5&gt;c__AnonStorey5">
       <method name="Int32 &lt;&gt;m__0()" attrs="131">
@@ -57175,6 +58269,36 @@
         <size>7</size>
       </method>
     </type>
+    <type name="G`1+&lt;TestStack_1&gt;c__async0[T]">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;TestStack_1&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;TestStack_2&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;TestStack_3&gt;c__async2">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;TestStack_4&gt;c__async3">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;TestStack_5&gt;c__async4">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-12.cs">
     <type name="C">
@@ -57204,7 +58328,7 @@
       <method name="Int32 &lt;&gt;m__2()" attrs="145">
         <size>9</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -57276,9 +58400,6 @@
       <method name="T[] CreateArray[T](Int32)" attrs="134">
         <size>15</size>
       </method>
-      <method name="Void CallRefParams(Int32 ByRef, System.Int32[])" attrs="148">
-        <size>5</size>
-      </method>
       <method name="Int32 CallNamed(Int32, Int32)" attrs="132">
         <size>12</size>
       </method>
@@ -57581,86 +58702,6 @@
         <size>872</size>
       </method>
     </type>
-    <type name="Tester+&lt;ArrayAccessTest_1&gt;c__async0">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_2&gt;c__async1">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_3&gt;c__async2">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_4&gt;c__async3">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_5&gt;c__async4">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_6&gt;c__async5">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_7&gt;c__async6">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_8&gt;c__async7">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_9&gt;c__async8">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;AssignTest_1&gt;c__async9">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;AssignTest_2&gt;c__asyncA">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;AssignTest_3&gt;c__asyncB">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;BinaryTest_1&gt;c__asyncC">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;BinaryTest_2&gt;c__asyncD">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;BinaryTest_3&gt;c__asyncE">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;BinaryTest_4&gt;c__asyncF">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
     <type name="Tester">
       <method name="System.Threading.Tasks.Task`1[System.Int32] BinaryTest_5()" attrs="129">
         <size>33</size>
@@ -57670,9 +58711,6 @@
       <method name="Void MoveNext()" attrs="486">
         <size>298</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester">
       <method name="System.Threading.Tasks.Task`1[System.Boolean] BinaryTest_6()" attrs="129">
@@ -57683,422 +58721,196 @@
       <method name="Void MoveNext()" attrs="486">
         <size>209</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;CallTest_1&gt;c__async12">
       <method name="Void MoveNext()" attrs="486">
         <size>430</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;CallTest_2&gt;c__async13">
       <method name="Void MoveNext()" attrs="486">
         <size>267</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;CallTest_3&gt;c__async14">
       <method name="Void MoveNext()" attrs="486">
         <size>237</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;CallTest_4&gt;c__async15">
       <method name="Void MoveNext()" attrs="486">
         <size>234</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;CallTest_5&gt;c__async16">
       <method name="Void MoveNext()" attrs="486">
         <size>250</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;CastTest_1&gt;c__async17">
       <method name="Void MoveNext()" attrs="486">
         <size>246</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;CastTest_2&gt;c__async18">
       <method name="Void MoveNext()" attrs="486">
         <size>233</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;CoalescingTest_1&gt;c__async19">
       <method name="Void MoveNext()" attrs="486">
         <size>358</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;CoalescingTest_2&gt;c__async1A">
       <method name="Void MoveNext()" attrs="486">
         <size>364</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;ConditionalTest_1&gt;c__async1B">
       <method name="Void MoveNext()" attrs="486">
         <size>197</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;ConditionalTest_2&gt;c__async1C">
       <method name="Void MoveNext()" attrs="486">
         <size>329</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;ConditionalTest_3&gt;c__async1D">
       <method name="Void MoveNext()" attrs="486">
         <size>347</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;ConditionalTest_4&gt;c__async1E">
       <method name="Void MoveNext()" attrs="486">
         <size>243</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;DelegateInvoke_4&gt;c__async1F">
       <method name="Void MoveNext()" attrs="486">
         <size>271</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;EventInvoke_1&gt;c__async20">
       <method name="Void MoveNext()" attrs="486">
         <size>260</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;FieldTest_1&gt;c__async21">
       <method name="Void MoveNext()" attrs="486">
         <size>535</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;IndexerTest_1&gt;c__async22">
       <method name="Void MoveNext()" attrs="486">
         <size>225</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;IndexerTest_2&gt;c__async23">
       <method name="Void MoveNext()" attrs="486">
         <size>335</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;IndexerTest_3&gt;c__async24">
       <method name="Void MoveNext()" attrs="486">
         <size>402</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;IndexerTest_4&gt;c__async25">
       <method name="Void MoveNext()" attrs="486">
         <size>442</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;IndexerTest_5&gt;c__async26">
       <method name="Void MoveNext()" attrs="486">
         <size>548</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;IndexerTest_6&gt;c__async27">
       <method name="Void MoveNext()" attrs="486">
         <size>544</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;IndexerTest_7&gt;c__async28">
       <method name="Void MoveNext()" attrs="486">
         <size>295</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;IsTest_1&gt;c__async29">
       <method name="Void MoveNext()" attrs="486">
         <size>233</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;IsTest_2&gt;c__async2A">
       <method name="Void MoveNext()" attrs="486">
         <size>233</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;LogicalUserOperator_1&gt;c__async2B">
       <method name="Void MoveNext()" attrs="486">
         <size>391</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;LogicalUserOperator_2&gt;c__async2C">
       <method name="Void MoveNext()" attrs="486">
         <size>299</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;LogicalUserOperator_3&gt;c__async2D">
       <method name="Void MoveNext()" attrs="486">
         <size>390</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;NewTest_1&gt;c__async2E">
       <method name="Void MoveNext()" attrs="486">
         <size>260</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;NewTest_2&gt;c__async2F">
       <method name="Void MoveNext()" attrs="486">
         <size>348</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;NewInitTest_1&gt;c__async30">
       <method name="Void MoveNext()" attrs="486">
         <size>1026</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;NewInitTest_2&gt;c__async31">
       <method name="Void MoveNext()" attrs="486">
         <size>739</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;NewArrayInitTest_1&gt;c__async32">
       <method name="Void MoveNext()" attrs="486">
         <size>240</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;NewArrayInitTest_2&gt;c__async33">
       <method name="Void MoveNext()" attrs="486">
         <size>355</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;NewArrayInitTest_3&gt;c__async34">
       <method name="Void MoveNext()" attrs="486">
         <size>246</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;NewArrayInitTest_4&gt;c__async35">
       <method name="Void MoveNext()" attrs="486">
         <size>427</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;NewArrayInitTest_5&gt;c__async36">
       <method name="Void MoveNext()" attrs="486">
         <size>264</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;NewArrayInitTest_6&gt;c__async37">
       <method name="Void MoveNext()" attrs="486">
         <size>266</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;PropertyTest_1&gt;c__async38">
-      <method name="Void MoveNext()" attrs="486">
-        <size>222</size>
-      </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;PropertyTest_2&gt;c__async39">
-      <method name="Void MoveNext()" attrs="486">
-        <size>295</size>
-      </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;PropertyTest_3&gt;c__async3A">
-      <method name="Void MoveNext()" attrs="486">
-        <size>645</size>
-      </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;StringConcatTest_1&gt;c__async3B">
-      <method name="Void MoveNext()" attrs="486">
-        <size>455</size>
-      </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;UnaryTest_1&gt;c__async3C">
-      <method name="Void MoveNext()" attrs="486">
-        <size>233</size>
-      </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;UnaryTest_2&gt;c__async3D">
-      <method name="Void MoveNext()" attrs="486">
-        <size>339</size>
-      </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;UnaryTest_3&gt;c__async3E">
-      <method name="Void MoveNext()" attrs="486">
-        <size>372</size>
-      </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;VariableInitializer_1&gt;c__async3F">
-      <method name="Void MoveNext()" attrs="486">
-        <size>348</size>
-      </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;ArrayAccessTest_5&gt;c__async4+&lt;ArrayAccessTest_5&gt;c__AnonStorey40">
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;BinaryTest_2&gt;c__asyncD+&lt;BinaryTest_2&gt;c__AnonStorey41">
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;CallTest_5&gt;c__async16+&lt;CallTest_5&gt;c__AnonStorey42">
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;EventInvoke_1&gt;c__async20+&lt;EventInvoke_1&gt;c__AnonStorey43">
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;IndexerTest_3&gt;c__async24+&lt;IndexerTest_3&gt;c__AnonStorey44">
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;IndexerTest_4&gt;c__async25+&lt;IndexerTest_4&gt;c__AnonStorey45">
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;IndexerTest_5&gt;c__async26+&lt;IndexerTest_5&gt;c__AnonStorey46">
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;IndexerTest_7&gt;c__async28+&lt;IndexerTest_7&gt;c__AnonStorey47">
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;UnaryTest_2&gt;c__async3D+&lt;UnaryTest_2&gt;c__AnonStorey48">
-      <method name="Void .ctor()" attrs="6278">
-        <size>7</size>
-      </method>
     </type>
     <type name="Tester">
       <method name="Tester &lt;CastTest_2&gt;m__4()" attrs="129">
@@ -58134,15 +58946,9 @@
       <method name="Int32 &lt;&gt;m__1()" attrs="145">
         <size>9</size>
       </method>
-      <method name="Decimal &lt;&gt;m__2()" attrs="145">
-        <size>19</size>
-      </method>
       <method name="Int32 &lt;&gt;m__3()" attrs="145">
         <size>9</size>
       </method>
-      <method name="Decimal &lt;&gt;m__4()" attrs="145">
-        <size>19</size>
-      </method>
     </type>
     <type name="Tester+&lt;ArrayAccessTest_4&gt;c__async3">
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
@@ -58287,11 +59093,6 @@
         <size>9</size>
       </method>
     </type>
-    <type name="Tester+&lt;CastTest_1&gt;c__async17">
-      <method name="Decimal &lt;&gt;m__0()" attrs="145">
-        <size>15</size>
-      </method>
-    </type>
     <type name="Tester+&lt;CoalescingTest_1&gt;c__async19">
       <method name="System.String &lt;&gt;m__0()" attrs="145">
         <size>9</size>
@@ -58503,17 +59304,36 @@
         <size>9</size>
       </method>
     </type>
-    <type name="Tester+&lt;PropertyTest_1&gt;c__async38">
+    <type name="Tester">
+      <method name="System.Threading.Tasks.Task`1[System.Boolean] NewArrayInitTest_7()" attrs="129">
+        <size>33</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;NewArrayInitTest_7&gt;c__async38">
+      <method name="Void MoveNext()" attrs="486">
+        <size>299</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;PropertyTest_1&gt;c__async39">
+      <method name="Void MoveNext()" attrs="486">
+        <size>222</size>
+      </method>
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>9</size>
       </method>
     </type>
-    <type name="Tester+&lt;PropertyTest_2&gt;c__async39">
+    <type name="Tester+&lt;PropertyTest_2&gt;c__async3A">
+      <method name="Void MoveNext()" attrs="486">
+        <size>295</size>
+      </method>
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>9</size>
       </method>
     </type>
-    <type name="Tester+&lt;PropertyTest_3&gt;c__async3A">
+    <type name="Tester+&lt;PropertyTest_3&gt;c__async3B">
+      <method name="Void MoveNext()" attrs="486">
+        <size>645</size>
+      </method>
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>10</size>
       </method>
@@ -58524,7 +59344,10 @@
         <size>9</size>
       </method>
     </type>
-    <type name="Tester+&lt;StringConcatTest_1&gt;c__async3B">
+    <type name="Tester+&lt;StringConcatTest_1&gt;c__async3C">
+      <method name="Void MoveNext()" attrs="486">
+        <size>455</size>
+      </method>
       <method name="System.String &lt;&gt;m__0()" attrs="145">
         <size>13</size>
       </method>
@@ -58535,17 +59358,31 @@
         <size>9</size>
       </method>
     </type>
-    <type name="Tester+&lt;UnaryTest_1&gt;c__async3C">
+    <type name="Tester+&lt;UnaryTest_1&gt;c__async3D">
+      <method name="Void MoveNext()" attrs="486">
+        <size>233</size>
+      </method>
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>9</size>
       </method>
     </type>
-    <type name="Tester+&lt;UnaryTest_3&gt;c__async3E">
+    <type name="Tester+&lt;UnaryTest_2&gt;c__async3E">
+      <method name="Void MoveNext()" attrs="486">
+        <size>339</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;UnaryTest_3&gt;c__async3F">
+      <method name="Void MoveNext()" attrs="486">
+        <size>372</size>
+      </method>
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>9</size>
       </method>
     </type>
-    <type name="Tester+&lt;VariableInitializer_1&gt;c__async3F">
+    <type name="Tester+&lt;VariableInitializer_1&gt;c__async40">
+      <method name="Void MoveNext()" attrs="486">
+        <size>348</size>
+      </method>
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>9</size>
       </method>
@@ -58553,12 +59390,15 @@
         <size>9</size>
       </method>
     </type>
-    <type name="Tester+&lt;ArrayAccessTest_5&gt;c__async4+&lt;ArrayAccessTest_5&gt;c__AnonStorey40">
+    <type name="Tester+&lt;ArrayAccessTest_5&gt;c__async4+&lt;ArrayAccessTest_5&gt;c__AnonStorey41">
       <method name="Int32 &lt;&gt;m__0()" attrs="131">
         <size>25</size>
       </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
     </type>
-    <type name="Tester+&lt;BinaryTest_2&gt;c__asyncD+&lt;BinaryTest_2&gt;c__AnonStorey41">
+    <type name="Tester+&lt;BinaryTest_2&gt;c__asyncD+&lt;BinaryTest_2&gt;c__AnonStorey42">
       <method name="Boolean &lt;&gt;m__0()" attrs="131">
         <size>24</size>
       </method>
@@ -58568,44 +59408,407 @@
       <method name="Boolean &lt;&gt;m__2()" attrs="131">
         <size>24</size>
       </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
     </type>
-    <type name="Tester+&lt;CallTest_5&gt;c__async16+&lt;CallTest_5&gt;c__AnonStorey42">
+    <type name="Tester+&lt;CallTest_5&gt;c__async16+&lt;CallTest_5&gt;c__AnonStorey43">
       <method name="Int32 &lt;&gt;m__0()" attrs="131">
         <size>25</size>
       </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
     </type>
-    <type name="Tester+&lt;EventInvoke_1&gt;c__async20+&lt;EventInvoke_1&gt;c__AnonStorey43">
+    <type name="Tester+&lt;EventInvoke_1&gt;c__async20+&lt;EventInvoke_1&gt;c__AnonStorey44">
       <method name="System.Action &lt;&gt;m__0()" attrs="131">
         <size>23</size>
       </method>
       <method name="Void &lt;&gt;m__1()" attrs="131">
         <size>9</size>
       </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
     </type>
-    <type name="Tester+&lt;IndexerTest_3&gt;c__async24+&lt;IndexerTest_3&gt;c__AnonStorey44">
+    <type name="Tester+&lt;IndexerTest_3&gt;c__async24+&lt;IndexerTest_3&gt;c__AnonStorey45">
       <method name="Int32 &lt;&gt;m__0()" attrs="131">
         <size>25</size>
       </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
     </type>
-    <type name="Tester+&lt;IndexerTest_4&gt;c__async25+&lt;IndexerTest_4&gt;c__AnonStorey45">
+    <type name="Tester+&lt;IndexerTest_4&gt;c__async25+&lt;IndexerTest_4&gt;c__AnonStorey46">
       <method name="Int32 &lt;&gt;m__0()" attrs="131">
         <size>25</size>
       </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
     </type>
-    <type name="Tester+&lt;IndexerTest_5&gt;c__async26+&lt;IndexerTest_5&gt;c__AnonStorey46">
+    <type name="Tester+&lt;IndexerTest_5&gt;c__async26+&lt;IndexerTest_5&gt;c__AnonStorey47">
       <method name="Int32 &lt;&gt;m__0()" attrs="131">
         <size>25</size>
       </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
     </type>
-    <type name="Tester+&lt;IndexerTest_7&gt;c__async28+&lt;IndexerTest_7&gt;c__AnonStorey47">
+    <type name="Tester+&lt;IndexerTest_7&gt;c__async28+&lt;IndexerTest_7&gt;c__AnonStorey48">
       <method name="Int32 &lt;&gt;m__0()" attrs="131">
         <size>25</size>
       </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
     </type>
-    <type name="Tester+&lt;UnaryTest_2&gt;c__async3D+&lt;UnaryTest_2&gt;c__AnonStorey48">
+    <type name="Tester+&lt;UnaryTest_2&gt;c__async3E+&lt;UnaryTest_2&gt;c__AnonStorey49">
       <method name="System.Nullable`1[System.Int16] &lt;&gt;m__0()" attrs="131">
         <size>14</size>
       </method>
+      <method name="Void .ctor()" attrs="6278">
+        <size>7</size>
+      </method>
+    </type>
+    <type name="Base">
+      <method name="Void CallRefParams(Int32 ByRef, Int32[])" attrs="148">
+        <size>5</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_1&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_2&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_3&gt;c__async2">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+      <method name="System.Decimal &lt;&gt;m__2()" attrs="145">
+        <size>19</size>
+      </method>
+      <method name="System.Decimal &lt;&gt;m__4()" attrs="145">
+        <size>19</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_4&gt;c__async3">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_5&gt;c__async4">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_6&gt;c__async5">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_7&gt;c__async6">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_8&gt;c__async7">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ArrayAccessTest_9&gt;c__async8">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;AssignTest_1&gt;c__async9">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;AssignTest_2&gt;c__asyncA">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;AssignTest_3&gt;c__asyncB">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;BinaryTest_1&gt;c__asyncC">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;BinaryTest_2&gt;c__asyncD">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;BinaryTest_3&gt;c__asyncE">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;BinaryTest_4&gt;c__asyncF">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;BinaryTest_5&gt;c__async10">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;BinaryTest_6&gt;c__async11">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;CallTest_1&gt;c__async12">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;CallTest_2&gt;c__async13">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;CallTest_3&gt;c__async14">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;CallTest_4&gt;c__async15">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;CallTest_5&gt;c__async16">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;CastTest_1&gt;c__async17">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+      <method name="System.Decimal &lt;&gt;m__0()" attrs="145">
+        <size>15</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;CastTest_2&gt;c__async18">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;CoalescingTest_1&gt;c__async19">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;CoalescingTest_2&gt;c__async1A">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ConditionalTest_1&gt;c__async1B">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ConditionalTest_2&gt;c__async1C">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ConditionalTest_3&gt;c__async1D">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;ConditionalTest_4&gt;c__async1E">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;DelegateInvoke_4&gt;c__async1F">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;EventInvoke_1&gt;c__async20">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;FieldTest_1&gt;c__async21">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;IndexerTest_1&gt;c__async22">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;IndexerTest_2&gt;c__async23">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;IndexerTest_3&gt;c__async24">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;IndexerTest_4&gt;c__async25">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;IndexerTest_5&gt;c__async26">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;IndexerTest_6&gt;c__async27">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;IndexerTest_7&gt;c__async28">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;IsTest_1&gt;c__async29">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;IsTest_2&gt;c__async2A">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;LogicalUserOperator_1&gt;c__async2B">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;LogicalUserOperator_2&gt;c__async2C">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;LogicalUserOperator_3&gt;c__async2D">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;NewTest_1&gt;c__async2E">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;NewTest_2&gt;c__async2F">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;NewInitTest_1&gt;c__async30">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;NewInitTest_2&gt;c__async31">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;NewArrayInitTest_1&gt;c__async32">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;NewArrayInitTest_2&gt;c__async33">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;NewArrayInitTest_3&gt;c__async34">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;NewArrayInitTest_4&gt;c__async35">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;NewArrayInitTest_5&gt;c__async36">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;NewArrayInitTest_6&gt;c__async37">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;NewArrayInitTest_7&gt;c__async38">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;PropertyTest_1&gt;c__async39">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;PropertyTest_2&gt;c__async3A">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;PropertyTest_3&gt;c__async3B">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;StringConcatTest_1&gt;c__async3C">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;UnaryTest_1&gt;c__async3D">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;UnaryTest_2&gt;c__async3E">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;UnaryTest_3&gt;c__async3F">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;VariableInitializer_1&gt;c__async40">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
     </type>
   </test>
   <test name="test-async-14.cs">
@@ -58634,23 +59837,23 @@
       </method>
     </type>
     <type name="C+&lt;TestResult&gt;c__async0">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
+      <method name="Int32 &lt;&gt;m__0()" attrs="145">
+        <size>9</size>
       </method>
     </type>
     <type name="C+&lt;Main&gt;c__async1">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
+      <method name="Int32 &lt;&gt;m__0()" attrs="145">
+        <size>9</size>
       </method>
     </type>
     <type name="C+&lt;TestResult&gt;c__async0">
-      <method name="Int32 &lt;&gt;m__0()" attrs="145">
-        <size>9</size>
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
       </method>
     </type>
     <type name="C+&lt;Main&gt;c__async1">
-      <method name="Int32 &lt;&gt;m__0()" attrs="145">
-        <size>9</size>
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
       </method>
     </type>
   </test>
@@ -58687,7 +59890,7 @@
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>10</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -58737,25 +59940,16 @@
       <method name="Void MoveNext()" attrs="486">
         <size>336</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;Using_1&gt;c__async1">
       <method name="Void MoveNext()" attrs="486">
         <size>809</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;Foreach_1&gt;c__async2">
       <method name="Void MoveNext()" attrs="486">
         <size>331</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;SwitchTest_1&gt;c__async0">
       <method name="System.String &lt;&gt;m__0()" attrs="145">
@@ -58781,6 +59975,21 @@
         <size>36</size>
       </method>
     </type>
+    <type name="Tester+&lt;SwitchTest_1&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;Using_1&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;Foreach_1&gt;c__async2">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-17.cs">
     <type name="Tester">
@@ -58854,36 +60063,6 @@
         <size>243</size>
       </method>
     </type>
-    <type name="Tester+&lt;TestException_1&gt;c__async0">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;TestException_2&gt;c__async1">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;TestException_3&gt;c__async2">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;TestException_4&gt;c__async3">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;TestException_5&gt;c__async4">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;TestException_6&gt;c__async5">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
     <type name="Tester">
       <method name="System.Threading.Tasks.Task`1[System.Int32] TestException_7()" attrs="129">
         <size>33</size>
@@ -58893,17 +60072,11 @@
       <method name="Void MoveNext()" attrs="486">
         <size>272</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;TestException_3&gt;c__async2+&lt;TestException_3&gt;c__async7">
       <method name="Void MoveNext()" attrs="486">
         <size>203</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;TestException_1&gt;c__async0">
       <method name="Void &lt;&gt;m__0()" attrs="145">
@@ -58945,6 +60118,46 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Tester+&lt;TestException_1&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;TestException_2&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;TestException_3&gt;c__async2">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;TestException_4&gt;c__async3">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;TestException_5&gt;c__async4">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;TestException_6&gt;c__async5">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;TestException_7&gt;c__async6">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;TestException_3&gt;c__async2+&lt;TestException_3&gt;c__async7">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-18.cs">
     <type name="Tester">
@@ -58979,21 +60192,6 @@
         <size>277</size>
       </method>
     </type>
-    <type name="Tester+&lt;Lambda_1&gt;c__async0">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;Lambda_2&gt;c__async1">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
-    <type name="Tester+&lt;Lambda_3&gt;c__async2`1[T]">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
     <type name="Tester+&lt;Lambda_1&gt;c__async0+&lt;Lambda_1&gt;c__AnonStorey3">
       <method name="Int32 &lt;&gt;m__0()" attrs="131">
         <size>14</size>
@@ -59027,6 +60225,21 @@
         <size>14</size>
       </method>
     </type>
+    <type name="Tester+&lt;Lambda_1&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;Lambda_2&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;Lambda_3&gt;c__async2`1[T]">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-19.cs">
     <type name="C">
@@ -59050,9 +60263,6 @@
       <method name="Void MoveNext()" attrs="486">
         <size>227</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="C+&lt;Test&gt;c__async0+&lt;Test&gt;c__AnonStorey1">
       <method name="Void &lt;&gt;m__0()" attrs="131">
@@ -59062,6 +60272,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="C+&lt;Test&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-20.cs">
     <type name="Base">
@@ -59108,33 +60323,21 @@
       <method name="Void MoveNext()" attrs="486">
         <size>492</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;AssignCompound_1&gt;c__async1">
       <method name="Void MoveNext()" attrs="486">
         <size>1229</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;Convert_1&gt;c__async2">
       <method name="Void MoveNext()" attrs="486">
         <size>344</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;Invocation_1&gt;c__async3">
       <method name="Void MoveNext()" attrs="486">
         <size>596</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tester+&lt;Add_1&gt;c__async0">
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
@@ -59156,6 +60359,26 @@
         <size>13</size>
       </method>
     </type>
+    <type name="Tester+&lt;Add_1&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;AssignCompound_1&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;Convert_1&gt;c__async2">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Tester+&lt;Invocation_1&gt;c__async3">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-21.cs">
     <type name="S">
@@ -59190,7 +60413,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>604</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -59236,15 +60459,6 @@
       </method>
     </type>
     <type name="asyncAttribute+async">
-      <method name="asyncAttribute+async Invoke(asyncAttribute+async)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="IAsyncResult BeginInvoke(asyncAttribute+async, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="asyncAttribute+async EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -59259,11 +60473,6 @@
         <size>35</size>
       </method>
     </type>
-    <type name="A+&lt;async&gt;c__async1">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-    </type>
     <type name="C">
       <method name="Void Test(Boolean)" attrs="145">
         <size>20</size>
@@ -59309,12 +60518,6 @@
       <method name="Void Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -59385,25 +60588,16 @@
       <method name="Void MoveNext()" attrs="486">
         <size>37</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="A+&lt;CastTest&gt;c__async3">
       <method name="Void MoveNext()" attrs="486">
         <size>285</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="A+async&gt;c__async0">
       <method name="Void MoveNext()" attrs="486">
         <size>31</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="D">
       <method name="System.Threading.Tasks.Task M()" attrs="129">
@@ -59417,7 +60611,48 @@
       <method name="Void MoveNext()" attrs="486">
         <size>31</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+    </type>
+    <type name="asyncAttribute+async">
+      <method name="async Invoke(async)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="System.IAsyncResult BeginInvoke(async, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="async EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="AwaitNS.Formals+D">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="A+&lt;async&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="A+&lt;async&gt;c__async2">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="A+&lt;CastTest&gt;c__async3">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="A+async&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="D+&lt;M&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -59452,9 +60687,6 @@
       <method name="Void MoveNext()" attrs="486">
         <size>197</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>21</size>
       </method>
@@ -59464,6 +60696,11 @@
         <size>15</size>
       </method>
     </type>
+    <type name="TestPostContext+&lt;Test&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-24.cs">
     <type name="Struct">
@@ -59489,7 +60726,7 @@
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>10</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -59543,7 +60780,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>169</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -59567,7 +60804,7 @@
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>10</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -59591,7 +60828,7 @@
       <method name="Int32 &lt;&gt;m__0(Int32)" attrs="145">
         <size>10</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -59612,7 +60849,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>331</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -59633,9 +60870,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>138</size>
       </method>
@@ -59656,9 +60890,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>137</size>
       </method>
@@ -59684,9 +60915,6 @@
       <method name="Void MoveNext()" attrs="486">
         <size>183</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="C+&lt;Test2&gt;c__Iterator1+&lt;Test2&gt;c__AnonStorey5">
       <method name="Void .ctor()" attrs="6278">
@@ -59697,9 +60925,6 @@
       <method name="Void MoveNext()" attrs="486">
         <size>183</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="C">
       <method name="System.Collections.Generic.IEnumerable`1[System.String] Test(System.String)" attrs="129">
@@ -59724,6 +60949,26 @@
         <size>41</size>
       </method>
     </type>
+    <type name="C+&lt;Test&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="C+&lt;Test2&gt;c__Iterator1">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="C+&lt;Test&gt;c__Iterator0+&lt;Test&gt;c__AnonStorey3+&lt;Test&gt;c__async2">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;Test2&gt;c__Iterator1+&lt;Test2&gt;c__AnonStorey5+&lt;Test2&gt;c__async4">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-31.cs">
     <type name="C">
@@ -59744,17 +60989,11 @@
       <method name="Void MoveNext()" attrs="486">
         <size>354</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="C+&lt;M2&gt;c__async1">
       <method name="Void MoveNext()" attrs="486">
         <size>469</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="C+&lt;M&gt;c__async0+&lt;M&gt;c__AnonStorey3">
       <method name="Void .ctor()" attrs="6278">
@@ -59780,6 +61019,16 @@
         <size>20</size>
       </method>
     </type>
+    <type name="C+&lt;M&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;M2&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-32.cs">
     <type name="Program">
@@ -59803,25 +61052,16 @@
       <method name="Void MoveNext()" attrs="486">
         <size>160</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Program+&lt;TestCanceled_2&gt;c__async1">
       <method name="Void MoveNext()" attrs="486">
         <size>159</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Program+&lt;TestException&gt;c__async2">
       <method name="Void MoveNext()" attrs="486">
         <size>160</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Program+&lt;Main&gt;c__AnonStorey3">
       <method name="Void &lt;&gt;m__0(System.Threading.Tasks.Task`1[System.Int32])" attrs="131">
@@ -59837,6 +61077,21 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Program+&lt;TestCanceled&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Program+&lt;TestCanceled_2&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Program+&lt;TestException&gt;c__async2">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-33.cs">
     <type name="A">
@@ -59891,15 +61146,19 @@
       <method name="Void MoveNext()" attrs="486">
         <size>177</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="B+&lt;Foo2&gt;c__async1">
       <method name="Void MoveNext()" attrs="486">
         <size>191</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+    </type>
+    <type name="B+&lt;Foo&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="B+&lt;Foo2&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -59923,15 +61182,19 @@
       <method name="Void MoveNext()" attrs="486">
         <size>186</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="C+&lt;Test2&gt;c__async1">
       <method name="Void MoveNext()" attrs="486">
         <size>59</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+    </type>
+    <type name="C+&lt;Test&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;Test2&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -59958,15 +61221,19 @@
       <method name="Void MoveNext()" attrs="486">
         <size>165</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="N.M.C+&lt;Main&gt;c__async1">
       <method name="Void MoveNext()" attrs="486">
         <size>162</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+    </type>
+    <type name="N.M.C+&lt;AsyncMethod&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="N.M.C+&lt;Main&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -59990,7 +61257,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>176</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60011,12 +61278,12 @@
       <method name="Void MoveNext()" attrs="486">
         <size>272</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
       <method name="Int32 &lt;&gt;m__0()" attrs="145">
         <size>7</size>
       </method>
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
     </type>
   </test>
   <test name="test-async-38.cs">
@@ -60041,7 +61308,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>172</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60062,12 +61329,12 @@
       <method name="Void MoveNext()" attrs="486">
         <size>220</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
       <method name="Void &lt;&gt;m__0()" attrs="145">
         <size>2</size>
       </method>
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
     </type>
   </test>
   <test name="test-async-40.cs">
@@ -60078,9 +61345,6 @@
       <method name="Void Main()" attrs="150">
         <size>36</size>
       </method>
-      <method name="Void &lt;Main&gt;m__0(Program+C)" attrs="145">
-        <size>35</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -60097,13 +61361,20 @@
       <method name="Void MoveNext()" attrs="486">
         <size>196</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
       <method name="Void &lt;&gt;m__0()" attrs="145">
         <size>2</size>
       </method>
     </type>
+    <type name="Program">
+      <method name="Void &lt;Main&gt;m__0(C)" attrs="145">
+        <size>35</size>
+      </method>
+    </type>
+    <type name="Program+&lt;Main&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-41.cs">
     <type name="AmbiguousGeneric">
@@ -60133,22 +61404,24 @@
       <method name="Void MoveNext()" attrs="486">
         <size>191</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="AmbiguousGeneric+&lt;NestedVoidTestSuccess&gt;c__async0+&lt;NestedVoidTestSuccess&gt;c__async4">
       <method name="Void MoveNext()" attrs="486">
         <size>162</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="AmbiguousGeneric+&lt;NestedVoidTestSuccess&gt;c__async0">
       <method name="System.Threading.Tasks.Task`1[System.Int32] &lt;&gt;m__0()" attrs="145">
         <size>33</size>
       </method>
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="AmbiguousGeneric+&lt;NestedVoidTestSuccess&gt;c__async0+&lt;NestedVoidTestSuccess&gt;c__async4">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
     </type>
   </test>
   <test name="test-async-42.cs">
@@ -60184,15 +61457,19 @@
       <method name="Void MoveNext()" attrs="486">
         <size>189</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="C+&lt;Foo&gt;c__async3">
       <method name="Void MoveNext()" attrs="486">
         <size>168</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+    </type>
+    <type name="C+&lt;Foo&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;Foo&gt;c__async3">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60227,9 +61504,6 @@
       <method name="Void MoveNext()" attrs="486">
         <size>242</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="C+&lt;Foo&gt;c__async0+&lt;Foo&gt;c__AnonStorey4">
       <method name="System.Threading.Tasks.Task &lt;&gt;m__0()" attrs="131">
@@ -60243,7 +61517,14 @@
       <method name="Void MoveNext()" attrs="486">
         <size>184</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+    </type>
+    <type name="C+&lt;Foo&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;Foo&gt;c__async0+&lt;Foo&gt;c__AnonStorey4+&lt;Foo&gt;c__async3">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60281,9 +61562,6 @@
       <method name="Void MoveNext()" attrs="486">
         <size>240</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="C+&lt;Foo&gt;c__async0+&lt;Foo&gt;c__AnonStorey4">
       <method name="System.Threading.Tasks.Task &lt;&gt;m__0()" attrs="131">
@@ -60297,7 +61575,14 @@
       <method name="Void MoveNext()" attrs="486">
         <size>213</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+    </type>
+    <type name="C+&lt;Foo&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="C+&lt;Foo&gt;c__async0+&lt;Foo&gt;c__AnonStorey4+&lt;Foo&gt;c__async3">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60318,7 +61603,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>272</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60339,7 +61624,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>158</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60388,7 +61673,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>60</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60417,15 +61702,19 @@
       <method name="Void MoveNext()" attrs="486">
         <size>173</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="App+&lt;Test&gt;c__async1">
       <method name="Void MoveNext()" attrs="486">
         <size>51</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+    </type>
+    <type name="App+&lt;Test&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="App+&lt;Test&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60468,9 +61757,6 @@
       <method name="Void MoveNext()" attrs="486">
         <size>213</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Tests+&lt;RefreshAsync&gt;c__AnonStorey1">
       <method name="Void .ctor()" attrs="6278">
@@ -60480,6 +61766,11 @@
         <size>18</size>
       </method>
     </type>
+    <type name="Tests+&lt;RefreshAsync&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-50.cs">
     <type name="X">
@@ -60509,7 +61800,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>185</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60527,12 +61818,6 @@
       </method>
     </type>
     <type name="Program+Model">
-      <method name="Program+Player get_SelectedPlayer()" attrs="2182">
-        <size>14</size>
-      </method>
-      <method name="Void set_SelectedPlayer(Program+Player)" attrs="2182">
-        <size>8</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -60546,33 +61831,37 @@
       <method name="Void MoveNext()" attrs="486">
         <size>87</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
-      <method name="Void &lt;&gt;m__0(Program+Player)" attrs="145">
-        <size>2</size>
-      </method>
     </type>
     <type name="Program">
       <method name="System.Action`1[Program+Player] &lt;LoadPlayers&gt;m__0(System.Action`1[Program+Player])" attrs="129">
         <size>20</size>
       </method>
-      <method name="Void &lt;LoadPlayers&gt;m__1(Program+Player)" attrs="129">
+      <method name="Void &lt;LoadPlayers&gt;m__1(Player)" attrs="129">
         <size>13</size>
       </method>
     </type>
+    <type name="Program+Model">
+      <method name="Player get_SelectedPlayer()" attrs="2182">
+        <size>14</size>
+      </method>
+      <method name="Void set_SelectedPlayer(Player)" attrs="2182">
+        <size>8</size>
+      </method>
+    </type>
+    <type name="Program+&lt;LoadPlayers&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+      <method name="Void &lt;&gt;m__0(Player)" attrs="145">
+        <size>2</size>
+      </method>
+    </type>
   </test>
   <test name="test-async-52.cs">
     <type name="ActualValueDelegate`1[T]">
       <method name="T Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="T EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -60598,15 +61887,27 @@
       <method name="Void MoveNext()" attrs="486">
         <size>157</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="X+&lt;Main&gt;c__async3">
       <method name="Void MoveNext()" attrs="486">
         <size>160</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+    </type>
+    <type name="ActualValueDelegate`1[T]">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="T EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="X+&lt;Throw&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="X+&lt;Main&gt;c__async3">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60646,7 +61947,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>43</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60670,15 +61971,19 @@
       <method name="Void MoveNext()" attrs="486">
         <size>226</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="Test+&lt;Foo&gt;c__async1">
       <method name="Void MoveNext()" attrs="486">
         <size>159</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+    </type>
+    <type name="Test+&lt;TestMethod&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="Test+&lt;Foo&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60710,7 +62015,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>278</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60731,7 +62036,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>169</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60752,7 +62057,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>172</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60781,7 +62086,7 @@
       <method name="Void MoveNext()" attrs="486">
         <size>49</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60808,15 +62113,19 @@
       <method name="Void MoveNext()" attrs="486">
         <size>190</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
-        <size>13</size>
-      </method>
     </type>
     <type name="X+&lt;ThrowAsync&gt;c__async1">
       <method name="Void MoveNext()" attrs="486">
         <size>163</size>
       </method>
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+    </type>
+    <type name="X+&lt;Test&gt;c__async0">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
+        <size>13</size>
+      </method>
+    </type>
+    <type name="X+&lt;ThrowAsync&gt;c__async1">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
@@ -60837,12 +62146,6 @@
       <method name="CLSDelegate Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="CLSDelegate EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -60936,6 +62239,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Delegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="CLSDelegate EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-cls-01.cs">
     <type name="CLSClass">
@@ -61120,12 +62431,6 @@
       <method name="UInt32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="UInt32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -61142,23 +62447,11 @@
       <method name="UInt32 Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="UInt32 EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
     </type>
     <type name="CLSClass_2">
-      <method name="Void Test(System.Int32[,], Int32)" attrs="134">
-        <size>2</size>
-      </method>
-      <method name="Void Test(System.Int32[,,], Boolean)" attrs="134">
-        <size>2</size>
-      </method>
       <method name="Void .ctor(Int32[,,])" attrs="6278">
         <size>8</size>
       </method>
@@ -61182,6 +62475,30 @@
         <size>7</size>
       </method>
     </type>
+    <type name="MyDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="UInt32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="CLSClass+MyDelegate">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="UInt32 EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="CLSClass_2">
+      <method name="Void Test(Int32[,], Int32)" attrs="134">
+        <size>2</size>
+      </method>
+      <method name="Void Test(Int32[,,], Boolean)" attrs="134">
+        <size>2</size>
+      </method>
+    </type>
   </test>
   <test name="test-cls-07.cs">
     <type name="aa.I1">
@@ -61210,9 +62527,6 @@
   </test>
   <test name="test-cls-11.cs">
     <type name="CLSClass">
-      <method name="Void Test(IComparable)" attrs="1478">
-        <size>0</size>
-      </method>
       <method name="Void .ctor()" attrs="6276">
         <size>7</size>
       </method>
@@ -61241,6 +62555,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="CLSClass">
+      <method name="Void Test(System.IComparable)" attrs="1478">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-cls-12.cs">
     <type name="MainClass">
@@ -61333,17 +62652,11 @@
   </test>
   <test name="test-cls-18.cs">
     <type name="Base">
-      <method name="Void Test(System.Int32[])" attrs="454">
-        <size>2</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
     </type>
     <type name="CLSClass">
-      <method name="Void Test(System.Int32[])" attrs="198">
-        <size>2</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
@@ -61351,6 +62664,16 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Base">
+      <method name="Void Test(Int32[])" attrs="454">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="CLSClass">
+      <method name="Void Test(Int32[])" attrs="198">
+        <size>2</size>
+      </method>
+    </type>
   </test>
   <test name="test-cls-19.cs">
     <type name="A">
@@ -61696,22 +63019,12 @@
       <method name="Void While_2()" attrs="129">
         <size>19</size>
       </method>
-    </type>
-    <type name="S">
-      <method name="IEnumerator GetEnumerator()" attrs="486">
-        <size>24</size>
-      </method>
-    </type>
-    <type name="C">
       <method name="Void For_1()" attrs="129">
         <size>33</size>
       </method>
       <method name="Void For_2()" attrs="129">
         <size>15</size>
       </method>
-      <method name="Void ForEach(System.Int32[])" attrs="129">
-        <size>31</size>
-      </method>
       <method name="Void ForEach_2(System.Collections.Generic.List`1[System.Object])" attrs="129">
         <size>56</size>
       </method>
@@ -61721,13 +63034,23 @@
       <method name="Void Using_4()" attrs="129">
         <size>38</size>
       </method>
-      <method name="Void ForEach_4(System.Int32[,])" attrs="129">
-        <size>78</size>
-      </method>
       <method name="Void Switch_2(System.Nullable`1[System.Int32])" attrs="129">
         <size>57</size>
       </method>
     </type>
+    <type name="S">
+      <method name="System.Collections.IEnumerator GetEnumerator()" attrs="486">
+        <size>24</size>
+      </method>
+    </type>
+    <type name="C">
+      <method name="Void ForEach(Int32[])" attrs="129">
+        <size>31</size>
+      </method>
+      <method name="Void ForEach_4(Int32[,])" attrs="129">
+        <size>78</size>
+      </method>
+    </type>
   </test>
   <test name="test-debug-12.cs">
     <type name="C">
@@ -61744,9 +63067,6 @@
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
-      <method name="IEnumerable Iter_2()" attrs="129">
-        <size>23</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -61758,9 +63078,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>72</size>
       </method>
@@ -61781,9 +63098,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>26</size>
       </method>
@@ -61812,6 +63126,21 @@
         <size>26</size>
       </method>
     </type>
+    <type name="C">
+      <method name="System.Collections.IEnumerable Iter_2()" attrs="129">
+        <size>23</size>
+      </method>
+    </type>
+    <type name="C+&lt;Iter_1&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="C+&lt;Iter_2&gt;c__Iterator1">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-debug-14.cs">
     <type name="C">
@@ -61983,24 +63312,24 @@
       <method name="Void MoveNext()" attrs="486">
         <size>1229</size>
       </method>
+      <method name="Int32 &lt;&gt;m__0()" attrs="145">
+        <size>9</size>
+      </method>
     </type>
     <type name="C+&lt;Test_1&gt;c__async0">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
     <type name="C+&lt;Test_2&gt;c__async1">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
     </type>
     <type name="C+&lt;Test_3&gt;c__async2">
-      <method name="Void SetStateMachine(IAsyncStateMachine)" attrs="486">
+      <method name="Void SetStateMachine(System.Runtime.CompilerServices.IAsyncStateMachine)" attrs="486">
         <size>13</size>
       </method>
-      <method name="Int32 &lt;&gt;m__0()" attrs="145">
-        <size>9</size>
-      </method>
     </type>
   </test>
   <test name="test-debug-20.cs">
@@ -62034,9 +63363,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Void &lt;&gt;__Finally0()" attrs="129">
         <size>13</size>
       </method>
@@ -62062,6 +63388,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="test-debug-22.cs">
@@ -62094,9 +63423,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>19</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>82</size>
       </method>
@@ -62119,6 +63445,9 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Int32] System.Collections.Generic.IEnumerable&lt;int&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="test-debug-23.cs">
@@ -62369,12 +63698,6 @@
   </test>
   <test name="test-iter-01.cs">
     <type name="X">
-      <method name="IEnumerator GetIt()" attrs="145">
-        <size>15</size>
-      </method>
-      <method name="IEnumerable GetIt2()" attrs="145">
-        <size>23</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>199</size>
       </method>
@@ -62409,9 +63732,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>149</size>
       </method>
@@ -62428,12 +63748,22 @@
         <size>26</size>
       </method>
     </type>
-  </test>
-  <test name="test-iter-02.cs">
     <type name="X">
-      <method name="IEnumerator GetRange()" attrs="145">
+      <method name="System.Collections.IEnumerator GetIt()" attrs="145">
         <size>15</size>
       </method>
+      <method name="System.Collections.IEnumerable GetIt2()" attrs="145">
+        <size>23</size>
+      </method>
+    </type>
+    <type name="X+&lt;GetIt2&gt;c__Iterator1">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+  </test>
+  <test name="test-iter-02.cs">
+    <type name="X">
       <method name="Int32 Main()" attrs="150">
         <size>103</size>
       </method>
@@ -62461,15 +63791,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="X">
+      <method name="System.Collections.IEnumerator GetRange()" attrs="145">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-03.cs">
     <type name="X">
-      <method name="IEnumerable GetIt(System.Int32[])" attrs="145">
-        <size>30</size>
-      </method>
-      <method name="IEnumerable GetMulti(System.Int32[,])" attrs="145">
-        <size>30</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>275</size>
       </method>
@@ -62484,9 +63813,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>159</size>
       </method>
@@ -62507,9 +63833,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>246</size>
       </method>
@@ -62533,12 +63856,27 @@
         <size>40</size>
       </method>
     </type>
+    <type name="X">
+      <method name="System.Collections.IEnumerable GetIt(Int32[])" attrs="145">
+        <size>30</size>
+      </method>
+      <method name="System.Collections.IEnumerable GetMulti(Int32[,])" attrs="145">
+        <size>30</size>
+      </method>
+    </type>
+    <type name="X+&lt;GetIt&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="X+&lt;GetMulti&gt;c__Iterator1">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-04.cs">
     <type name="X">
-      <method name="IEnumerable GetRange(Int32, Int32)" attrs="145">
-        <size>37</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>104</size>
       </method>
@@ -62553,9 +63891,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>130</size>
       </method>
@@ -62572,12 +63907,19 @@
         <size>52</size>
       </method>
     </type>
+    <type name="X">
+      <method name="System.Collections.IEnumerable GetRange(Int32, Int32)" attrs="145">
+        <size>37</size>
+      </method>
+    </type>
+    <type name="X+&lt;GetRange&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-05.cs">
     <type name="X">
-      <method name="IEnumerable GetIt()" attrs="145">
-        <size>23</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>119</size>
       </method>
@@ -62586,9 +63928,6 @@
       </method>
     </type>
     <type name="List">
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>20</size>
-      </method>
       <method name="Void Add(Int32)" attrs="134">
         <size>27</size>
       </method>
@@ -62620,9 +63959,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>191</size>
       </method>
@@ -62639,23 +63975,24 @@
         <size>26</size>
       </method>
     </type>
-  </test>
-  <test name="test-iter-06.cs">
-    <type name="S">
-      <method name="IEnumerable Get(Int32)" attrs="134">
-        <size>42</size>
-      </method>
-      <method name="IEnumerable GetS(Int32)" attrs="150">
-        <size>30</size>
+    <type name="X">
+      <method name="System.Collections.IEnumerable GetIt()" attrs="145">
+        <size>23</size>
       </method>
     </type>
-    <type name="X">
-      <method name="IEnumerable Get(Int32)" attrs="129">
-        <size>30</size>
+    <type name="List">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>20</size>
       </method>
-      <method name="IEnumerable GetS(Int32)" attrs="145">
-        <size>30</size>
+    </type>
+    <type name="X+&lt;GetIt&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
       </method>
+    </type>
+  </test>
+  <test name="test-iter-06.cs">
+    <type name="X">
       <method name="Int32 Main()" attrs="150">
         <size>449</size>
       </method>
@@ -62670,9 +64007,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>198</size>
       </method>
@@ -62693,9 +64027,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>159</size>
       </method>
@@ -62735,9 +64066,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[System.Object] System.Collections.Generic.IEnumerable&lt;object&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
@@ -62761,9 +64089,6 @@
       <method name="Void Reset()" attrs="486">
         <size>6</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="System.Collections.Generic.IEnumerator`1[System.Object] System.Collections.Generic.IEnumerable&lt;object&gt;.GetEnumerator()" attrs="481">
         <size>40</size>
       </method>
@@ -62771,12 +64096,45 @@
         <size>7</size>
       </method>
     </type>
+    <type name="S">
+      <method name="System.Collections.IEnumerable Get(Int32)" attrs="134">
+        <size>42</size>
+      </method>
+      <method name="System.Collections.IEnumerable GetS(Int32)" attrs="150">
+        <size>30</size>
+      </method>
+    </type>
+    <type name="X">
+      <method name="System.Collections.IEnumerable Get(Int32)" attrs="129">
+        <size>30</size>
+      </method>
+      <method name="System.Collections.IEnumerable GetS(Int32)" attrs="145">
+        <size>30</size>
+      </method>
+    </type>
+    <type name="S+&lt;Get&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="S+&lt;GetS&gt;c__Iterator1">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="X+&lt;Get&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="X+&lt;GetS&gt;c__Iterator1">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-07.cs">
     <type name="Test">
-      <method name="IEnumerable Foo(Int32)" attrs="134">
-        <size>30</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -62796,9 +64154,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>264</size>
       </method>
@@ -62824,6 +64179,16 @@
         <size>40</size>
       </method>
     </type>
+    <type name="Test">
+      <method name="System.Collections.IEnumerable Foo(Int32)" attrs="134">
+        <size>30</size>
+      </method>
+    </type>
+    <type name="Test+&lt;Foo&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-08.cs">
     <type name="Foo">
@@ -62835,9 +64200,6 @@
       </method>
     </type>
     <type name="X">
-      <method name="IEnumerable Test(Int32, Int32)" attrs="150">
-        <size>37</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>210</size>
       </method>
@@ -62852,9 +64214,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>377</size>
       </method>
@@ -62874,12 +64233,19 @@
         <size>52</size>
       </method>
     </type>
+    <type name="X">
+      <method name="System.Collections.IEnumerable Test(Int32, Int32)" attrs="150">
+        <size>37</size>
+      </method>
+    </type>
+    <type name="X+&lt;Test&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-09.cs">
     <type name="Tester">
-      <method name="IEnumerator GetEnumerator()" attrs="134">
-        <size>22</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>154</size>
       </method>
@@ -62912,21 +64278,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Tester">
+      <method name="System.Collections.IEnumerator GetEnumerator()" attrs="134">
+        <size>22</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-10.cs">
     <type name="X">
-      <method name="IEnumerator get_GetIt()" attrs="2193">
-        <size>15</size>
-      </method>
-      <method name="Void set_GetIt(IEnumerator)" attrs="2193">
-        <size>2</size>
-      </method>
-      <method name="IEnumerable get_Item(Int32)" attrs="2177">
-        <size>30</size>
-      </method>
-      <method name="Void set_Item(Int32, IEnumerable)" attrs="2177">
-        <size>2</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>211</size>
       </method>
@@ -62961,9 +64320,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>168</size>
       </method>
@@ -62980,6 +64336,25 @@
         <size>40</size>
       </method>
     </type>
+    <type name="X">
+      <method name="System.Collections.IEnumerator get_GetIt()" attrs="2193">
+        <size>15</size>
+      </method>
+      <method name="Void set_GetIt(System.Collections.IEnumerator)" attrs="2193">
+        <size>2</size>
+      </method>
+      <method name="System.Collections.IEnumerable get_Item(Int32)" attrs="2177">
+        <size>30</size>
+      </method>
+      <method name="Void set_Item(Int32, System.Collections.IEnumerable)" attrs="2177">
+        <size>2</size>
+      </method>
+    </type>
+    <type name="X+&lt;&gt;c__Iterator1">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-11.cs">
     <type name="X">
@@ -62989,9 +64364,6 @@
       <method name="Void remove_Hook(System.EventHandler)" attrs="2182">
         <size>42</size>
       </method>
-      <method name="IEnumerator Pipeline()" attrs="134">
-        <size>22</size>
-      </method>
       <method name="Void M(System.Object, System.EventArgs)" attrs="145">
         <size>12</size>
       </method>
@@ -63022,12 +64394,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="X">
+      <method name="System.Collections.IEnumerator Pipeline()" attrs="134">
+        <size>22</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-12.cs">
     <type name="X">
-      <method name="IEnumerable a()" attrs="129">
-        <size>30</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
@@ -63042,9 +64416,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>190</size>
       </method>
@@ -63064,15 +64435,22 @@
         <size>40</size>
       </method>
     </type>
+    <type name="X">
+      <method name="System.Collections.IEnumerable a()" attrs="129">
+        <size>30</size>
+      </method>
+    </type>
+    <type name="X+&lt;a&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-13.cs">
     <type name="Test">
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
-      <method name="IEnumerable syntax_error(System.Object, System.Object)" attrs="150">
-        <size>23</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -63081,9 +64459,6 @@
       </method>
     </type>
     <type name="Test+Yp">
-      <method name="IEnumerable fail()" attrs="134">
-        <size>10</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -63095,9 +64470,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>27</size>
       </method>
@@ -63114,15 +64486,27 @@
         <size>26</size>
       </method>
     </type>
+    <type name="Test">
+      <method name="System.Collections.IEnumerable syntax_error(System.Object, System.Object)" attrs="150">
+        <size>23</size>
+      </method>
+    </type>
+    <type name="Test+Yp">
+      <method name="System.Collections.IEnumerable fail()" attrs="134">
+        <size>10</size>
+      </method>
+    </type>
+    <type name="Test+&lt;syntax_error&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-14.cs">
     <type name="XX">
       <method name="Void Metodo(System.Exception)" attrs="145">
         <size>42</size>
       </method>
-      <method name="IEnumerable X()" attrs="145">
-        <size>23</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>69</size>
       </method>
@@ -63137,9 +64521,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>98</size>
       </method>
@@ -63156,12 +64537,19 @@
         <size>26</size>
       </method>
     </type>
+    <type name="XX">
+      <method name="System.Collections.IEnumerable X()" attrs="145">
+        <size>23</size>
+      </method>
+    </type>
+    <type name="XX+&lt;X&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-15.cs">
     <type name="Test">
-      <method name="IEnumerator GetEnumerator()" attrs="134">
-        <size>22</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>12</size>
       </method>
@@ -63192,12 +64580,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test">
+      <method name="System.Collections.IEnumerator GetEnumerator()" attrs="134">
+        <size>22</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-16.cs">
     <type name="Foo">
-      <method name="IEnumerable foo()" attrs="150">
-        <size>23</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>78</size>
       </method>
@@ -63212,9 +64602,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>38</size>
       </method>
@@ -63231,12 +64618,19 @@
         <size>26</size>
       </method>
     </type>
+    <type name="Foo">
+      <method name="System.Collections.IEnumerable foo()" attrs="150">
+        <size>23</size>
+      </method>
+    </type>
+    <type name="Foo+&lt;foo&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-17.cs">
     <type name="Program">
-      <method name="IEnumerable get_Empty()" attrs="2198">
-        <size>23</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>62</size>
       </method>
@@ -63251,9 +64645,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>168</size>
       </method>
@@ -63270,12 +64661,19 @@
         <size>26</size>
       </method>
     </type>
+    <type name="Program">
+      <method name="System.Collections.IEnumerable get_Empty()" attrs="2198">
+        <size>23</size>
+      </method>
+    </type>
+    <type name="Program+&lt;&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-18.cs">
     <type name="test">
-      <method name="IEnumerable testen(Int32)" attrs="134">
-        <size>30</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -63295,9 +64693,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>214</size>
       </method>
@@ -63314,15 +64709,22 @@
         <size>40</size>
       </method>
     </type>
+    <type name="test">
+      <method name="System.Collections.IEnumerable testen(Int32)" attrs="134">
+        <size>30</size>
+      </method>
+    </type>
+    <type name="test+&lt;testen&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-19.cs">
     <type name="Test">
       <method name="Void Main()" attrs="150">
         <size>68</size>
       </method>
-      <method name="IEnumerator GetEnumerator()" attrs="134">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -63347,12 +64749,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test">
+      <method name="System.Collections.IEnumerator GetEnumerator()" attrs="134">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-20.cs">
     <type name="CustomDict">
-      <method name="IEnumerator GetEnumerator()" attrs="134">
-        <size>22</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>70</size>
       </method>
@@ -63385,12 +64789,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="CustomDict">
+      <method name="System.Collections.IEnumerator GetEnumerator()" attrs="134">
+        <size>22</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-21.cs">
     <type name="X">
-      <method name="IEnumerable GetIt(System.Int32[])" attrs="145">
-        <size>30</size>
-      </method>
       <method name="Int32 Main()" attrs="150">
         <size>138</size>
       </method>
@@ -63402,12 +64808,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -63419,9 +64819,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>242</size>
       </method>
@@ -63448,15 +64845,30 @@
         <size>40</size>
       </method>
     </type>
+    <type name="X">
+      <method name="System.Collections.IEnumerable GetIt(Int32[])" attrs="145">
+        <size>30</size>
+      </method>
+    </type>
+    <type name="X+A">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
+    <type name="X+&lt;GetIt&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-22.cs">
     <type name="Test">
       <method name="Void Main()" attrs="150">
         <size>68</size>
       </method>
-      <method name="IEnumerator GetEnumerator()" attrs="134">
-        <size>15</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -63481,12 +64893,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Test">
+      <method name="System.Collections.IEnumerator GetEnumerator()" attrs="134">
+        <size>15</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-23.cs">
     <type name="X">
-      <method name="IEnumerable GetIt2()" attrs="145">
-        <size>23</size>
-      </method>
       <method name="Int32 Delay()" attrs="145">
         <size>28</size>
       </method>
@@ -63507,9 +64921,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>117</size>
       </method>
@@ -63536,6 +64947,16 @@
         <size>26</size>
       </method>
     </type>
+    <type name="X">
+      <method name="System.Collections.IEnumerable GetIt2()" attrs="145">
+        <size>23</size>
+      </method>
+    </type>
+    <type name="X+&lt;GetIt2&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-iter-25.cs">
     <type name="D">
@@ -63564,9 +64985,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>60</size>
       </method>
@@ -63597,13 +65015,13 @@
       <method name="System.Collections.Generic.IEnumerator`1[System.Object] System.Collections.Generic.IEnumerable&lt;object&gt;.GetEnumerator()" attrs="481">
         <size>26</size>
       </method>
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
     </type>
   </test>
   <test name="test-iter-26.cs">
     <type name="C">
-      <method name="IEnumerable Test(Boolean, Int32)" attrs="150">
-        <size>37</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>10</size>
       </method>
@@ -63618,9 +65036,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>101</size>
       </method>
@@ -63637,6 +65052,16 @@
         <size>52</size>
       </method>
     </type>
+    <type name="C">
+      <method name="System.Collections.IEnumerable Test(Boolean, Int32)" attrs="150">
+        <size>37</size>
+      </method>
+    </type>
+    <type name="C+&lt;Test&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-named-01.cs">
     <type name="A">
@@ -63693,9 +65118,6 @@
       </method>
     </type>
     <type name="C">
-      <method name="Decimal Foo(Decimal, Decimal)" attrs="145">
-        <size>10</size>
-      </method>
       <method name="System.String Bar(Int32, System.String, Char)" attrs="145">
         <size>34</size>
       </method>
@@ -63708,6 +65130,9 @@
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
+      <method name="System.Decimal Foo(System.Decimal, System.Decimal)" attrs="145">
+        <size>10</size>
+      </method>
     </type>
   </test>
   <test name="test-named-03.cs">
@@ -63726,13 +65151,13 @@
       <method name="Int32 Invoke(Int32)" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
+      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
-      <method name="Int32 EndInvoke(IAsyncResult)" attrs="454">
+      <method name="System.IAsyncResult BeginInvoke(Int32, System.AsyncCallback, System.Object)" attrs="454">
         <size>0</size>
       </method>
-      <method name="Void .ctor(Object, IntPtr)" attrs="6278">
+      <method name="Int32 EndInvoke(System.IAsyncResult)" attrs="454">
         <size>0</size>
       </method>
     </type>
@@ -63945,9 +65370,6 @@
   </test>
   <test name="test-partial-04.cs">
     <type name="B.Test">
-      <method name="Void A.IFoo.Hello(IFoo)" attrs="481">
-        <size>2</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -63960,6 +65382,11 @@
         <size>7</size>
       </method>
     </type>
+    <type name="B.Test">
+      <method name="Void A.IFoo.Hello(A.IFoo)" attrs="481">
+        <size>2</size>
+      </method>
+    </type>
   </test>
   <test name="test-partial-05.cs">
     <type name="B">
@@ -64113,9 +65540,6 @@
   </test>
   <test name="test-partial-12.cs">
     <type name="Test1.Foo">
-      <method name="IEnumerable E()" attrs="147">
-        <size>23</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -64135,9 +65559,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>76</size>
       </method>
@@ -64154,6 +65575,16 @@
         <size>26</size>
       </method>
     </type>
+    <type name="Test1.Foo">
+      <method name="System.Collections.IEnumerable E()" attrs="147">
+        <size>23</size>
+      </method>
+    </type>
+    <type name="Test1.Foo+&lt;E&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-partial-13.cs">
     <type name="Test.Test">
@@ -64204,15 +65635,6 @@
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
-      <method name="IEnumerable Attempts2()" attrs="150">
-        <size>23</size>
-      </method>
-      <method name="IEnumerable get_Attempts()" attrs="2198">
-        <size>23</size>
-      </method>
-      <method name="IEnumerable get_Item(Int32)" attrs="2182">
-        <size>23</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -64224,9 +65646,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>32</size>
       </method>
@@ -64247,9 +65666,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>32</size>
       </method>
@@ -64270,9 +65686,6 @@
       <method name="System.Object System.Collections.IEnumerator.get_Current()" attrs="2529">
         <size>14</size>
       </method>
-      <method name="IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
-        <size>14</size>
-      </method>
       <method name="Boolean MoveNext()" attrs="486">
         <size>32</size>
       </method>
@@ -64301,6 +65714,32 @@
         <size>26</size>
       </method>
     </type>
+    <type name="Foo.X">
+      <method name="System.Collections.IEnumerable get_Attempts()" attrs="2198">
+        <size>23</size>
+      </method>
+      <method name="System.Collections.IEnumerable get_Item(Int32)" attrs="2182">
+        <size>23</size>
+      </method>
+      <method name="System.Collections.IEnumerable Attempts2()" attrs="150">
+        <size>23</size>
+      </method>
+    </type>
+    <type name="Foo.X+&lt;Attempts2&gt;c__Iterator0">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="Foo.X+&lt;&gt;c__Iterator1">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
+    <type name="Foo.X+&lt;&gt;c__Iterator2">
+      <method name="System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()" attrs="481">
+        <size>14</size>
+      </method>
+    </type>
   </test>
   <test name="test-partial-16.cs">
     <type name="A.C">
@@ -64403,12 +65842,6 @@
       <method name="Void Test()" attrs="134">
         <size>13</size>
       </method>
-      <method name="Void add_ContactsEventHandler(Mono.Sms.Contacts+ContactsHandler)" attrs="2182">
-        <size>42</size>
-      </method>
-      <method name="Void remove_ContactsEventHandler(Mono.Sms.Contacts+ContactsHandler)" attrs="2182">
-        <size>42</size>
-      </method>
       <method name="Void .ctor()" attrs="6278">
         <size>7</size>
       </method>
@@ -64417,12 +65850,6 @@
       <method name="Void Invoke()" attrs="454">
         <size>0</size>
       </method>
-      <method name="IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
-        <size>0</size>
-      </method>
-      <method name="Void EndInvoke(IAsyncResult)" attrs="454">
-        <size>0</size>
-      </method>
       <method name="Void .ctor(Object, IntPtr)" attrs="6278">
         <size>0</size>
       </method>
@@ -64438,6 +65865,22 @@
         <size>7</size>
       </method>
     </type>
+    <type name="Mono.Sms.Contacts">
+      <method name="Void add_ContactsEventHandler(ContactsHandler)" attrs="2182">
+        <size>42</size>
+      </method>
+      <method name="Void remove_ContactsEventHandler(ContactsHandler)" attrs="2182">
+        <size>42</size>
+      </method>
+    </type>
+    <type name="Mono.Sms.Contacts+ContactsHandler">
+      <method name="System.IAsyncResult BeginInvoke(System.AsyncCallback, System.Object)" attrs="454">
+        <size>0</size>
+      </method>
+      <method name="Void EndInvoke(System.IAsyncResult)" attrs="454">
+        <size>0</size>
+      </method>
+    </type>
   </test>
   <test name="test-partial-22.cs">
     <type name="C">
@@ -64559,12 +66002,6 @@
   </test>
   <test name="test-partial-30.cs">
     <type name="PartialProblems.Classes">
-      <method name="Void M1(PartialProblems.Classes+partial)" attrs="129">
-        <size>2</size>
-      </method>
-      <method name="PartialProblems.Classes+partial M3()" attrs="129">
-        <size>10</size>
-      </method>
       <method name="Void Main()" attrs="150">
         <size>2</size>
       </method>
@@ -64577,6 +66014,14 @@
         <size>7</size>
       </method>
     </type>
+    <type name="PartialProblems.Classes">
+      <method name="Void M1(partial)" attrs="129">
+        <size>2</size>
+      </method>
+      <method name="partial M3()" attrs="129">
+        <size>10</size>
+      </method>
+    </type>
   </test>
   <test name="test-partial-31.cs">
     <type name="TestPartialOverride.BaseNamespace.Base">