Merge pull request #857 from sjakobi/ghc-head-update-3

Update ghc-head

1 files changed, 276 insertions, 366 deletions

diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index 4bcd2508..d4c2417c 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -133,19 +133,19 @@
 	><p
 	  >This module illustrates &amp; tests most of the features of Haddock.
  Testing references from the description: <code
-	    ><a href="#"
+	    ><a href="#" title="Test"
 	      >T</a
 	      ></code
 	    >, <code
-	    ><a href="#"
+	    ><a href="#" title="Test"
 	      >f</a
 	      ></code
 	    >, <code
-	    ><a href="#"
+	    ><a href="#" title="Test"
 	      >g</a
 	      ></code
 	    >, <code
-	    ><a href="#"
+	    ><a href="#" title="Visible"
 	      >visible</a
 	      ></code
 	    >.</p
@@ -165,25 +165,15 @@
 	      ><li
 		>= <a href="#"
 		  >A</a
-		  > <a href="#"
-		  >Int</a
-		  > (<a href="#"
-		  >Maybe</a
-		  > <a href="#"
-		  >Float</a
-		  >)</li
+		  > Int (Maybe Float)</li
 		><li
 		>| <a href="#"
 		  >B</a
-		  > (<a href="#"
+		  > (<a href="#" title="Test"
 		  >T</a
-		  > a b, <a href="#"
+		  > a b, <a href="#" title="Test"
 		  >T</a
-		  > <a href="#"
-		  >Int</a
-		  > <a href="#"
-		  >Float</a
-		  >)</li
+		  > Int Float)</li
 		></ul
 	      ></li
 	    ><li class="src short"
@@ -357,9 +347,7 @@
 		  ><li
 		    ><a href="#"
 		      >p</a
-		      > :: <a href="#"
-		      >Int</a
-		      ></li
+		      > :: Int</li
 		    ><li
 		    ><a href="#"
 		      >q</a
@@ -371,9 +359,7 @@
 		      >r</a
 		      >, <a href="#"
 		      >s</a
-		      > :: <a href="#"
-		      >Int</a
-		      ></li
+		      > :: Int</li
 		    ></ul
 		  > }</li
 		><li
@@ -383,25 +369,13 @@
 		  ><li
 		    ><a href="#"
 		      >t</a
-		      > :: T1 -&gt; <a href="#"
+		      > :: T1 -&gt; <a href="#" title="Test"
 		      >T2</a
-		      > <a href="#"
-		      >Int</a
-		      > <a href="#"
-		      >Int</a
-		      > -&gt; <a href="#"
+		      > Int Int -&gt; <a href="#" title="Test"
 		      >T3</a
-		      > <a href="#"
-		      >Bool</a
-		      > <a href="#"
-		      >Bool</a
-		      > -&gt; <a href="#"
+		      > Bool Bool -&gt; <a href="#" title="Test"
 		      >T4</a
-		      > <a href="#"
-		      >Float</a
-		      > <a href="#"
-		      >Float</a
-		      > -&gt; <a href="#"
+		      > Float Float -&gt; <a href="#" title="Test"
 		      >T5</a
 		      > () ()</li
 		    ><li
@@ -409,9 +383,7 @@
 		      >u</a
 		      >, <a href="#"
 		      >v</a
-		      > :: <a href="#"
-		      >Int</a
-		      ></li
+		      > :: Int</li
 		    ></ul
 		  > }</li
 		></ul
@@ -427,34 +399,56 @@
 	      ><li
 		><a href="#"
 		  >s1</a
-		  > :: <a href="#"
-		  >Int</a
-		  ></li
+		  > :: Int</li
 		><li
 		><a href="#"
 		  >s2</a
-		  > :: <a href="#"
-		  >Int</a
-		  ></li
+		  > :: Int</li
 		><li
 		><a href="#"
 		  >s3</a
-		  > :: <a href="#"
-		  >Int</a
-		  ></li
+		  > :: Int</li
 		></ul
 	      >}</li
 	    ><li class="src short"
+	    ><a href="#"
+	      >p</a
+	      > :: <a href="#" title="Test"
+	      >R</a
+	      > -&gt; Int</li
+	    ><li class="src short"
+	    ><a href="#"
+	      >q</a
+	      > :: <a href="#" title="Test"
+	      >R</a
+	      > -&gt; <span class="keyword"
+	      >forall</span
+	      > a. a -&gt; a</li
+	    ><li class="src short"
+	    ><a href="#"
+	      >u</a
+	      > :: <a href="#" title="Test"
+	      >R</a
+	      > -&gt; Int</li
+	    ><li class="src short"
 	    ><span class="keyword"
 	      >class</span
-	      > <a href="#"
+	      > <a href="#" title="Test"
 	      >D</a
 	      > a =&gt; <a href="#"
 	      >C</a
 	      > a <span class="keyword"
 	      >where</span
 	      ><ul class="subs"
-	      ></ul
+	      ><li
+		><a href="#"
+		  >a</a
+		  > :: IO a</li
+		><li
+		><a href="#"
+		  >b</a
+		  > :: [a]</li
+		></ul
 	      ></li
 	    ><li class="src short"
 	    ><span class="keyword"
@@ -464,7 +458,17 @@
 	      > a <span class="keyword"
 	      >where</span
 	      ><ul class="subs"
-	      ></ul
+	      ><li
+		><a href="#"
+		  >d</a
+		  > :: <a href="#" title="Test"
+		  >T</a
+		  > a b</li
+		><li
+		><a href="#"
+		  >e</a
+		  > :: (a, a)</li
+		></ul
 	      ></li
 	    ><li class="src short"
 	    ><span class="keyword"
@@ -480,40 +484,32 @@
 	      > a <span class="keyword"
 	      >where</span
 	      ><ul class="subs"
-	      ></ul
+	      ><li
+		><a href="#"
+		  >ff</a
+		  > :: a</li
+		></ul
 	      ></li
 	    ><li class="src short"
 	    ><a href="#"
 	      >a</a
-	      > :: <a href="#"
+	      > :: <a href="#" title="Test"
 	      >C</a
-	      > a =&gt; <a href="#"
-	      >IO</a
-	      > a</li
+	      > a =&gt; IO a</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >f</a
-	      > :: <a href="#"
+	      > :: <a href="#" title="Test"
 	      >C</a
-	      > a =&gt; a -&gt; <a href="#"
-	      >Int</a
-	      ></li
+	      > a =&gt; a -&gt; Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >g</a
-	      > :: <a href="#"
-	      >Int</a
-	      > -&gt; <a href="#"
-	      >IO</a
-	      > CInt</li
+	      > :: Int -&gt; IO CInt</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >hidden</a
-	      > :: <a href="#"
-	      >Int</a
-	      > -&gt; <a href="#"
-	      >Int</a
-	      ></li
+	      > :: Int -&gt; Int</li
 	    ><li class="src short"
 	    >module <a href="#"
 	      >Visible</a
@@ -525,7 +521,7 @@
 	      >Ex</a
 	      > a<ul class="subs"
 	      ><li
-		>= <a href="#"
+		>= <a href="#" title="Test"
 		  >C</a
 		  > b =&gt; <a href="#"
 		  >Ex1</a
@@ -535,7 +531,7 @@
 		  >Ex2</a
 		  > b</li
 		><li
-		>| <a href="#"
+		>| <a href="#" title="Test"
 		  >C</a
 		  > a =&gt; <a href="#"
 		  >Ex3</a
@@ -551,77 +547,41 @@
 	    ><li class="src short"
 	    ><a href="#"
 	      >k</a
-	      > :: <a href="#"
+	      > :: <a href="#" title="Test"
 	      >T</a
-	      > () () -&gt; <a href="#"
+	      > () () -&gt; <a href="#" title="Test"
 	      >T2</a
-	      > <a href="#"
-	      >Int</a
-	      > <a href="#"
-	      >Int</a
-	      > -&gt; (<a href="#"
+	      > Int Int -&gt; (<a href="#" title="Test"
 	      >T3</a
-	      > <a href="#"
-	      >Bool</a
-	      > <a href="#"
-	      >Bool</a
-	      > -&gt; <a href="#"
+	      > Bool Bool -&gt; <a href="#" title="Test"
 	      >T4</a
-	      > <a href="#"
-	      >Float</a
-	      > <a href="#"
-	      >Float</a
-	      >) -&gt; <a href="#"
+	      > Float Float) -&gt; <a href="#" title="Test"
 	      >T5</a
-	      > () () -&gt; <a href="#"
-	      >IO</a
-	      > ()</li
+	      > () () -&gt; IO ()</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >l</a
-	      > :: (<a href="#"
-	      >Int</a
-	      >, <a href="#"
-	      >Int</a
-	      >, <a href="#"
-	      >Float</a
-	      >) -&gt; <a href="#"
-	      >Int</a
-	      ></li
+	      > :: (Int, Int, Float) -&gt; Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >m</a
-	      > :: <a href="#"
+	      > :: <a href="#" title="Test"
 	      >R</a
-	      > -&gt; <a href="#"
+	      > -&gt; <a href="#" title="Test"
 	      >N1</a
-	      > () -&gt; <a href="#"
-	      >IO</a
-	      > <a href="#"
-	      >Int</a
-	      ></li
+	      > () -&gt; IO Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >o</a
-	      > :: <a href="#"
-	      >Float</a
-	      > -&gt; <a href="#"
-	      >IO</a
-	      > <a href="#"
-	      >Float</a
-	      ></li
+	      > :: Float -&gt; IO Float</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >f'</a
-	      > :: <a href="#"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >withType</a
-	      > :: <a href="#"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >withoutType</a
@@ -630,10 +590,14 @@
 	  ></details
 	></div
       ><div id="interface"
-      ><h1 id="g:1"
-	>Type declarations</h1
-	><h2 id="g:2"
-	>Data types</h2
+      ><a href="#" id="g:1"
+	><h1
+	  >Type declarations</h1
+	  ></a
+	><a href="#" id="g:2"
+	><h2
+	  >Data types</h2
+	  ></a
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
@@ -658,17 +622,11 @@
 	      ><td class="src"
 		><a id="v:A" class="def"
 		  >A</a
-		  > <a href="#"
-		  >Int</a
-		  > (<a href="#"
-		  >Maybe</a
-		  > <a href="#"
-		  >Float</a
-		  >)</td
+		  > Int (Maybe Float)</td
 		><td class="doc"
 		><p
 		  >This comment describes the <code
-		    ><a href="#"
+		    ><a href="#" title="Test"
 		      >A</a
 		      ></code
 		    > constructor</p
@@ -678,19 +636,15 @@
 	      ><td class="src"
 		><a id="v:B" class="def"
 		  >B</a
-		  > (<a href="#"
+		  > (<a href="#" title="Test"
 		  >T</a
-		  > a b, <a href="#"
+		  > a b, <a href="#" title="Test"
 		  >T</a
-		  > <a href="#"
-		  >Int</a
-		  > <a href="#"
-		  >Float</a
-		  >)</td
+		  > Int Float)</td
 		><td class="doc"
 		><p
 		  >This comment describes the <code
-		    ><a href="#"
+		    ><a href="#" title="Test"
 		      >B</a
 		      ></code
 		    > constructor</p
@@ -802,7 +756,7 @@
 		><td class="doc"
 		><p
 		  >documents <code
-		    ><a href="#"
+		    ><a href="#" title="Test"
 		      >A3</a
 		      ></code
 		    ></p
@@ -816,7 +770,7 @@
 		><td class="doc"
 		><p
 		  >documents <code
-		    ><a href="#"
+		    ><a href="#" title="Test"
 		      >B3</a
 		      ></code
 		    ></p
@@ -850,7 +804,7 @@
 		><td class="doc"
 		><p
 		  >This is the doc for <code
-		    ><a href="#"
+		    ><a href="#" title="Test"
 		      >A4</a
 		      ></code
 		    ></p
@@ -864,7 +818,7 @@
 		><td class="doc"
 		><p
 		  >This is the doc for <code
-		    ><a href="#"
+		    ><a href="#" title="Test"
 		      >B4</a
 		      ></code
 		    ></p
@@ -878,7 +832,7 @@
 		><td class="doc"
 		><p
 		  >This is the doc for <code
-		    ><a href="#"
+		    ><a href="#" title="Test"
 		      >C4</a
 		      ></code
 		    ></p
@@ -1000,7 +954,7 @@
 			><div class="doc"
 			><p
 			  >this is the <code
-			    ><a href="#"
+			    ><a href="#" title="Test"
 			      >n3</a
 			      ></code
 			    > field</p
@@ -1141,7 +1095,7 @@
 		><td class="doc"
 		><p
 		  >The <code
-		    ><a href="#"
+		    ><a href="#" title="Test"
 		      >N7</a
 		      ></code
 		    > constructor</p
@@ -1168,8 +1122,10 @@
 	      ></table
 	    ></div
 	  ></div
-	><h2 id="g:3"
-	>Records</h2
+	><a href="#" id="g:3"
+	><h2
+	  >Records</h2
+	  ></a
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
@@ -1182,24 +1138,24 @@
 	  ><div class="doc"
 	  ><p
 	    >This is the documentation for the <code
-	      ><a href="#"
+	      ><a href="#" title="Test"
 		>R</a
 		></code
 	      > record, which has four fields,
  <code
-	      ><a href="#"
+	      ><a href="#" title="Test"
 		>p</a
 		></code
 	      >, <code
-	      ><a href="#"
+	      ><a href="#" title="Test"
 		>q</a
 		></code
 	      >, <code
-	      ><a href="#"
+	      ><a href="#" title="Test"
 		>r</a
 		></code
 	      >, and <code
-	      ><a href="#"
+	      ><a href="#" title="Test"
 		>s</a
 		></code
 	      >.</p
@@ -1216,7 +1172,7 @@
 		><td class="doc"
 		><p
 		  >This is the <code
-		    ><a href="#"
+		    ><a href="#" title="Test"
 		      >C1</a
 		      ></code
 		    > record constructor, with the following fields:</p
@@ -1232,13 +1188,11 @@
 		      ><dfn class="src"
 			><a id="v:p" class="def"
 			  >p</a
-			  > :: <a href="#"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc"
 			><p
 			  >This comment applies to the <code
-			    ><a href="#"
+			    ><a href="#" title="Test"
 			      >p</a
 			      ></code
 			    > field</p
@@ -1254,7 +1208,7 @@
 			><div class="doc"
 			><p
 			  >This comment applies to the <code
-			    ><a href="#"
+			    ><a href="#" title="Test"
 			      >q</a
 			      ></code
 			    > field</p
@@ -1266,17 +1220,15 @@
 			  >r</a
 			  >, <a id="v:s" class="def"
 			  >s</a
-			  > :: <a href="#"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc"
 			><p
 			  >This comment applies to both <code
-			    ><a href="#"
+			    ><a href="#" title="Test"
 			      >r</a
 			      ></code
 			    > and <code
-			    ><a href="#"
+			    ><a href="#" title="Test"
 			      >s</a
 			      ></code
 			    ></p
@@ -1294,7 +1246,7 @@
 		><td class="doc"
 		><p
 		  >This is the <code
-		    ><a href="#"
+		    ><a href="#" title="Test"
 		      >C2</a
 		      ></code
 		    > record constructor, also with some fields:</p
@@ -1310,25 +1262,13 @@
 		      ><dfn class="src"
 			><a id="v:t" class="def"
 			  >t</a
-			  > :: T1 -&gt; <a href="#"
+			  > :: T1 -&gt; <a href="#" title="Test"
 			  >T2</a
-			  > <a href="#"
-			  >Int</a
-			  > <a href="#"
-			  >Int</a
-			  > -&gt; <a href="#"
+			  > Int Int -&gt; <a href="#" title="Test"
 			  >T3</a
-			  > <a href="#"
-			  >Bool</a
-			  > <a href="#"
-			  >Bool</a
-			  > -&gt; <a href="#"
+			  > Bool Bool -&gt; <a href="#" title="Test"
 			  >T4</a
-			  > <a href="#"
-			  >Float</a
-			  > <a href="#"
-			  >Float</a
-			  > -&gt; <a href="#"
+			  > Float Float -&gt; <a href="#" title="Test"
 			  >T5</a
 			  > () ()</dfn
 			><div class="doc empty"
@@ -1340,9 +1280,7 @@
 			  >u</a
 			  >, <a id="v:v" class="def"
 			  >v</a
-			  > :: <a href="#"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc empty"
 			></div
 			></li
@@ -1378,7 +1316,7 @@
 		><td class="doc"
 		><p
 		  >This is the <code
-		    ><a href="#"
+		    ><a href="#" title="Test"
 		      >C3</a
 		      ></code
 		    > record constructor</p
@@ -1394,13 +1332,11 @@
 		      ><dfn class="src"
 			><a id="v:s1" class="def"
 			  >s1</a
-			  > :: <a href="#"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc"
 			><p
 			  >The <code
-			    ><a href="#"
+			    ><a href="#" title="Test"
 			      >s1</a
 			      ></code
 			    > record selector</p
@@ -1410,13 +1346,11 @@
 		      ><dfn class="src"
 			><a id="v:s2" class="def"
 			  >s2</a
-			  > :: <a href="#"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc"
 			><p
 			  >The <code
-			    ><a href="#"
+			    ><a href="#" title="Test"
 			      >s2</a
 			      ></code
 			    > record selector</p
@@ -1426,13 +1360,11 @@
 		      ><dfn class="src"
 			><a id="v:s3" class="def"
 			  >s3</a
-			  > :: <a href="#"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc"
 			><p
 			  >The <code
-			    ><a href="#"
+			    ><a href="#" title="Test"
 			      >s3</a
 			      ></code
 			    > record selector</p
@@ -1449,13 +1381,63 @@
 	><p
 	  >test that we can export record selectors on their own:</p
 	  ></div
-	><h1 id="g:4"
-	>Class declarations</h1
+	><div class="top"
+	><p class="src"
+	  ><a id="v:p" class="def"
+	    >p</a
+	    > :: <a href="#" title="Test"
+	    >R</a
+	    > -&gt; Int <a href="#" class="selflink"
+	    >#</a
+	    ></p
+	  ><div class="doc"
+	  ><p
+	    >This comment applies to the <code
+	      ><a href="#" title="Test"
+		>p</a
+		></code
+	      > field</p
+	    ></div
+	  ></div
+	><div class="top"
+	><p class="src"
+	  ><a id="v:q" class="def"
+	    >q</a
+	    > :: <a href="#" title="Test"
+	    >R</a
+	    > -&gt; <span class="keyword"
+	    >forall</span
+	    > a. a -&gt; a <a href="#" class="selflink"
+	    >#</a
+	    ></p
+	  ><div class="doc"
+	  ><p
+	    >This comment applies to the <code
+	      ><a href="#" title="Test"
+		>q</a
+		></code
+	      > field</p
+	    ></div
+	  ></div
+	><div class="top"
+	><p class="src"
+	  ><a id="v:u" class="def"
+	    >u</a
+	    > :: <a href="#" title="Test"
+	    >R</a
+	    > -&gt; Int <a href="#" class="selflink"
+	    >#</a
+	    ></p
+	  ></div
+	><a href="#" id="g:4"
+	><h1
+	  >Class declarations</h1
+	  ></a
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#"
+	    > <a href="#" title="Test"
 	    >D</a
 	    > a =&gt; <a id="t:C" class="def"
 	    >C</a
@@ -1469,36 +1451,24 @@
 	    >This comment applies to the <em
 	      >previous</em
 	      > declaration (the <code
-	      ><a href="#"
+	      ><a href="#" title="Test"
 		>C</a
 		></code
 	      > class)</p
 	    ></div
-	  ><div class="subs minimal"
-	  ><p class="caption"
-	    >Minimal complete definition</p
-	    ><p class="src"
-	    ><a href="#"
-	      >a</a
-	      >, <a href="#"
-	      >b</a
-	      ></p
-	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
 	    ><a id="v:a" class="def"
 	      >a</a
-	      > :: <a href="#"
-	      >IO</a
-	      > a <a href="#" class="selflink"
+	      > :: IO a <a href="#" class="selflink"
 	      >#</a
 	      ></p
 	    ><div class="doc"
 	    ><p
 	      >this is a description of the <code
-		><a href="#"
+		><a href="#" title="Test"
 		  >a</a
 		  ></code
 		> method</p
@@ -1512,7 +1482,7 @@
 	    ><div class="doc"
 	    ><p
 	      >this is a description of the <code
-		><a href="#"
+		><a href="#" title="Test"
 		  >b</a
 		  ></code
 		> method</p
@@ -1534,23 +1504,13 @@
 	  ><p
 	    >This is a class declaration with no separate docs for the methods</p
 	    ></div
-	  ><div class="subs minimal"
-	  ><p class="caption"
-	    >Minimal complete definition</p
-	    ><p class="src"
-	    ><a href="#"
-	      >d</a
-	      >, <a href="#"
-	      >e</a
-	      ></p
-	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
 	    ><a id="v:d" class="def"
 	      >d</a
-	      > :: <a href="#"
+	      > :: <a href="#" title="Test"
 	      >T</a
 	      > a b <a href="#" class="selflink"
 	      >#</a
@@ -1572,11 +1532,9 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:ic:D:D:1"
 		      ></span
-		      > <a href="#"
+		      > <a href="#" title="Test"
 		      >D</a
-		      > <a href="#"
-		      >Float</a
-		      ></span
+		      > Float</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -1588,27 +1546,25 @@
 		  ><details id="i:ic:D:D:1"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="subs methods"
+		      ><p
+		      >Defined in <a href="#"
+			>Test</a
+			></p
+		      > <div class="subs methods"
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
 			><a href="#"
 			  >d</a
-			  > :: <a href="#"
+			  > :: <a href="#" title="Test"
 			  >T</a
-			  > <a href="#"
-			  >Float</a
-			  > b <a href="#" class="selflink"
+			  > Float b <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >e</a
-			  > :: (<a href="#"
-			  >Float</a
-			  >, <a href="#"
-			  >Float</a
-			  >) <a href="#" class="selflink"
+			  > :: (Float, Float) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -1620,11 +1576,9 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:ic:D:D:2"
 		      ></span
-		      > <a href="#"
+		      > <a href="#" title="Test"
 		      >D</a
-		      > <a href="#"
-		      >Int</a
-		      ></span
+		      > Int</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -1636,27 +1590,25 @@
 		  ><details id="i:ic:D:D:2"
 		    ><summary class="hide-when-js-enabled"
 		      >Instance details</summary
-		      ><div class="subs methods"
+		      ><p
+		      >Defined in <a href="#"
+			>Test</a
+			></p
+		      > <div class="subs methods"
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
 			><a href="#"
 			  >d</a
-			  > :: <a href="#"
+			  > :: <a href="#" title="Test"
 			  >T</a
-			  > <a href="#"
-			  >Int</a
-			  > b <a href="#" class="selflink"
+			  > Int b <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >e</a
-			  > :: (<a href="#"
-			  >Int</a
-			  >, <a href="#"
-			  >Int</a
-			  >) <a href="#" class="selflink"
+			  > :: (Int, Int) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -1698,14 +1650,6 @@
 	    > <a href="#" class="selflink"
 	    >#</a
 	    ></p
-	  ><div class="subs minimal"
-	  ><p class="caption"
-	    >Minimal complete definition</p
-	    ><p class="src"
-	    ><a href="#"
-	      >ff</a
-	      ></p
-	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
@@ -1725,40 +1669,38 @@
 	><p class="src"
 	  ><a id="v:a" class="def"
 	    >a</a
-	    > :: <a href="#"
+	    > :: <a href="#" title="Test"
 	    >C</a
-	    > a =&gt; <a href="#"
-	    >IO</a
-	    > a <a href="#" class="selflink"
+	    > a =&gt; IO a <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >this is a description of the <code
-	      ><a href="#"
+	      ><a href="#" title="Test"
 		>a</a
 		></code
 	      > method</p
 	    ></div
 	  ></div
-	><h1 id="g:5"
-	>Function types</h1
+	><a href="#" id="g:5"
+	><h1
+	  >Function types</h1
+	  ></a
 	><div class="top"
 	><p class="src"
 	  ><a id="v:f" class="def"
 	    >f</a
-	    > :: <a href="#"
+	    > :: <a href="#" title="Test"
 	    >C</a
-	    > a =&gt; a -&gt; <a href="#"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > a =&gt; a -&gt; Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >In a comment string we can refer to identifiers in scope with
 single quotes like this: <code
-	      ><a href="#"
+	      ><a href="#" title="Test"
 		>T</a
 		></code
 	      >, and we can refer to modules by
@@ -1791,7 +1733,7 @@ using double quotes: <a href="#"
 	      ></dl
 	    ><pre
 	    >     This is a block of code, which can include other markup: <code
-	      ><a href="#"
+	      ><a href="#" title="Test"
 		>R</a
 		></code
 	      >
@@ -1811,11 +1753,7 @@ using double quotes: <a href="#"
 	><p class="src"
 	  ><a id="v:g" class="def"
 	    >g</a
-	    > :: <a href="#"
-	    >Int</a
-	    > -&gt; <a href="#"
-	    >IO</a
-	    > CInt <a href="#" class="selflink"
+	    > :: Int -&gt; IO CInt <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -1823,8 +1761,10 @@ using double quotes: <a href="#"
 	    >we can export foreign declarations too</p
 	    ></div
 	  ></div
-	><h1 id="g:6"
-	>Auxiliary stuff</h1
+	><a href="#" id="g:6"
+	><h1
+	  >Auxiliary stuff</h1
+	  ></a
 	><div class="doc"
 	><p
 	  >This is some documentation that is attached to a name ($aux1)
@@ -1916,22 +1856,22 @@ test2
 each line must begin with &gt; (which isn't significant unless it
 is at the beginning of the line).</pre
 	  ></div
-	><h1 id="g:7"
-	>A hidden module</h1
+	><a href="#" id="g:7"
+	><h1
+	  >A hidden module</h1
+	  ></a
 	><div class="top"
 	><p class="src"
 	  ><a id="v:hidden" class="def"
 	    >hidden</a
-	    > :: <a href="#"
-	    >Int</a
-	    > -&gt; <a href="#"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int -&gt; Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
-	><h1 id="g:8"
-	>A visible module</h1
+	><a href="#" id="g:8"
+	><h1
+	  >A visible module</h1
+	  ></a
 	><div class="top"
 	><p class="src"
 	  >module <a href="#"
@@ -1942,8 +1882,10 @@ is at the beginning of the line).</pre
 	><p
 	  >nested-style doc comments </p
 	  ></div
-	><h1 id="g:9"
-	>Existential / Universal types</h1
+	><a href="#" id="g:9"
+	><h1
+	  >Existential / Universal types</h1
+	  ></a
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
@@ -1963,7 +1905,7 @@ is at the beginning of the line).</pre
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#"
+		><a href="#" title="Test"
 		  >C</a
 		  > b =&gt; <a id="v:Ex1" class="def"
 		  >Ex1</a
@@ -1981,7 +1923,7 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#"
+		><a href="#" title="Test"
 		  >C</a
 		  > a =&gt; <a id="v:Ex3" class="def"
 		  >Ex3</a
@@ -2002,8 +1944,10 @@ is at the beginning of the line).</pre
 	      ></table
 	    ></div
 	  ></div
-	><h1 id="g:10"
-	>Type signatures with argument docs</h1
+	><a href="#" id="g:10"
+	><h1
+	  >Type signatures with argument docs</h1
+	  ></a
 	><div class="top"
 	><p class="src"
 	  ><a id="v:k" class="def"
@@ -2017,13 +1961,13 @@ is at the beginning of the line).</pre
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: <a href="#"
+		>:: <a href="#" title="Test"
 		  >T</a
 		  > () ()</td
 		><td class="doc"
 		><p
 		  >This argument has type <code
-		    ><a href="#"
+		    ><a href="#" title="Test"
 		      >T</a
 		      ></code
 		    ></p
@@ -2031,13 +1975,9 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href="#"
+		>-&gt; <a href="#" title="Test"
 		  >T2</a
-		  > <a href="#"
-		  >Int</a
-		  > <a href="#"
-		  >Int</a
-		  ></td
+		  > Int Int</td
 		><td class="doc"
 		><p
 		  >This argument has type 'T2 Int Int'</p
@@ -2045,19 +1985,11 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; (<a href="#"
+		>-&gt; (<a href="#" title="Test"
 		  >T3</a
-		  > <a href="#"
-		  >Bool</a
-		  > <a href="#"
-		  >Bool</a
-		  > -&gt; <a href="#"
+		  > Bool Bool -&gt; <a href="#" title="Test"
 		  >T4</a
-		  > <a href="#"
-		  >Float</a
-		  > <a href="#"
-		  >Float</a
-		  >)</td
+		  > Float Float)</td
 		><td class="doc"
 		><p
 		  >This argument has type <code
@@ -2067,7 +1999,7 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href="#"
+		>-&gt; <a href="#" title="Test"
 		  >T5</a
 		  > () ()</td
 		><td class="doc"
@@ -2079,9 +2011,7 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href="#"
-		  >IO</a
-		  > ()</td
+		>-&gt; IO ()</td
 		><td class="doc"
 		><p
 		  >This is the result type</p
@@ -2107,13 +2037,7 @@ is at the beginning of the line).</pre
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: (<a href="#"
-		  >Int</a
-		  >, <a href="#"
-		  >Int</a
-		  >, <a href="#"
-		  >Float</a
-		  >)</td
+		>:: (Int, Int, Float)</td
 		><td class="doc"
 		><p
 		  >takes a triple</p
@@ -2121,15 +2045,11 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href="#"
-		  >Int</a
-		  ></td
+		>-&gt; Int</td
 		><td class="doc"
 		><p
 		  >returns an <code
-		    ><a href="#"
-		      >Int</a
-		      ></code
+		    >Int</code
 		    ></p
 		  ></td
 		></tr
@@ -2149,7 +2069,7 @@ is at the beginning of the line).</pre
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: <a href="#"
+		>:: <a href="#" title="Test"
 		  >R</a
 		  ></td
 		><td class="doc empty"
@@ -2157,7 +2077,7 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href="#"
+		>-&gt; <a href="#" title="Test"
 		  >N1</a
 		  > ()</td
 		><td class="doc"
@@ -2167,11 +2087,7 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href="#"
-		  >IO</a
-		  > <a href="#"
-		  >Int</a
-		  ></td
+		>-&gt; IO Int</td
 		><td class="doc"
 		><p
 		  >and the return value</p
@@ -2197,9 +2113,7 @@ is at the beginning of the line).</pre
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: <a href="#"
-		  >Float</a
-		  ></td
+		>:: Float</td
 		><td class="doc"
 		><p
 		  >The input float</p
@@ -2207,11 +2121,7 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href="#"
-		  >IO</a
-		  > <a href="#"
-		  >Float</a
-		  ></td
+		>-&gt; IO Float</td
 		><td class="doc"
 		><p
 		  >The output float</p
@@ -2224,10 +2134,14 @@ is at the beginning of the line).</pre
 	    >A foreign import with argument docs</p
 	    ></div
 	  ></div
-	><h1 id="g:11"
-	>A section</h1
-	><h2 id="g:12"
-	>A subsection</h2
+	><a href="#" id="g:11"
+	><h1
+	  >A section</h1
+	  ></a
+	><a href="#" id="g:12"
+	><h2
+	  >A subsection</h2
+	  ></a
 	><div class="doc"
 	><pre
 	  >a literal line</pre
@@ -2240,15 +2154,13 @@ is at the beginning of the line).</pre
 	><p class="src"
 	  ><a id="v:f-39-" class="def"
 	    >f'</a
-	    > :: <a href="#"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >a function with a prime can be referred to as <code
-	      ><a href="#"
+	      ><a href="#" title="Test"
 		>f'</a
 		></code
 	      >
@@ -2259,9 +2171,7 @@ is at the beginning of the line).</pre
 	><p class="src"
 	  ><a id="v:withType" class="def"
 	    >withType</a
-	    > :: <a href="#"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"