From 69b98a99ce4de93ea0e6082bd11edb3baaf2fa6e Mon Sep 17 00:00:00 2001
From: Alexander Biehl <alexbiehl@gmail.com>
Date: Fri, 2 Mar 2018 15:43:21 +0100
Subject: Make testsuite work with haddock-1.19.0 release (#766)

---
 html-test/ref/BundledPatterns2.html | 98 ++++++++++++++++++-------------------
 1 file changed, 49 insertions(+), 49 deletions(-)

(limited to 'html-test/ref/BundledPatterns2.html')

diff --git a/html-test/ref/BundledPatterns2.html b/html-test/ref/BundledPatterns2.html
index 385fd07f..9e791c65 100644
--- a/html-test/ref/BundledPatterns2.html
+++ b/html-test/ref/BundledPatterns2.html
@@ -48,11 +48,11 @@
 	      >data</span
 	      > <a href="#"
 	      >Vec</a
-	      > :: <a href="#"
+	      > :: <a href="#" title="GHC.TypeNats"
 	      >Nat</a
-	      > -&gt; <a href="#"
+	      > -&gt; <a href="#" title="Data.Kind"
 	      >*</a
-	      > -&gt; <a href="#"
+	      > -&gt; <a href="#" title="Data.Kind"
 	      >*</a
 	      > <span class="keyword"
 	      >where</span
@@ -61,22 +61,22 @@
 		><span class="keyword"
 		  >pattern</span
 		  > <a href="#"
-		  >Empty</a
-		  > :: <a href="#"
+		  >(:&gt;)</a
+		  > :: a -&gt; <a href="#" title="BundledPatterns2"
 		  >Vec</a
-		  > 0 a</li
+		  > n a -&gt; <a href="#" title="BundledPatterns2"
+		  >Vec</a
+		  > (n <a href="#" title="Bug310"
+		  >+</a
+		  > 1) a</li
 		><li
 		><span class="keyword"
 		  >pattern</span
 		  > <a href="#"
-		  >(:&gt;)</a
-		  > :: a -&gt; <a href="#"
-		  >Vec</a
-		  > n a -&gt; <a href="#"
+		  >Empty</a
+		  > :: <a href="#" title="BundledPatterns2"
 		  >Vec</a
-		  > (n <a href="#"
-		  >+</a
-		  > 1) a</li
+		  > 0 a</li
 		></ul
 	      ></li
 	    ><li class="src short"
@@ -84,11 +84,11 @@
 	      >data</span
 	      > <a href="#"
 	      >RTree</a
-	      > :: <a href="#"
+	      > :: <a href="#" title="GHC.TypeNats"
 	      >Nat</a
-	      > -&gt; <a href="#"
+	      > -&gt; <a href="#" title="Data.Kind"
 	      >*</a
-	      > -&gt; <a href="#"
+	      > -&gt; <a href="#" title="Data.Kind"
 	      >*</a
 	      > <span class="keyword"
 	      >where</span
@@ -98,7 +98,7 @@
 		  >pattern</span
 		  > <a href="#"
 		  >LR</a
-		  > :: a -&gt; <a href="#"
+		  > :: a -&gt; <a href="#" title="BundledPatterns2"
 		  >RTree</a
 		  > 0 a</li
 		><li
@@ -106,13 +106,13 @@
 		  >pattern</span
 		  > <a href="#"
 		  >BR</a
-		  > :: <a href="#"
+		  > :: <a href="#" title="BundledPatterns2"
 		  >RTree</a
-		  > d a -&gt; <a href="#"
+		  > d a -&gt; <a href="#" title="BundledPatterns2"
 		  >RTree</a
-		  > d a -&gt; <a href="#"
+		  > d a -&gt; <a href="#" title="BundledPatterns2"
 		  >RTree</a
-		  > (d <a href="#"
+		  > (d <a href="#" title="Bug310"
 		  >+</a
 		  > 1) a</li
 		></ul
@@ -129,11 +129,11 @@
 	    >data</span
 	    > <a id="t:Vec" class="def"
 	    >Vec</a
-	    > :: <a href="#"
+	    > :: <a href="#" title="GHC.TypeNats"
 	    >Nat</a
-	    > -&gt; <a href="#"
+	    > -&gt; <a href="#" title="Data.Kind"
 	    >*</a
-	    > -&gt; <a href="#"
+	    > -&gt; <a href="#" title="Data.Kind"
 	    >*</a
 	    > <span class="keyword"
 	    >where</span
@@ -148,7 +148,7 @@
 	      >Lists with their length encoded in their type</li
 	      ><li
 	      ><code
-		><a href="#"
+		><a href="#" title="BundledPatterns2"
 		  >Vec</a
 		  ></code
 		>tor elements have an <strong
@@ -156,7 +156,7 @@
 		> subscript starting from 0 and
    ending at <code
 		><code
-		  ><a href="#"
+		  ><a href="#" title="Data.Foldable"
 		    >length</a
 		    ></code
 		  > - 1</code
@@ -168,28 +168,16 @@
 	    >Bundled Patterns</p
 	    ><table
 	    ><tr
-	      ><td class="src"
-		><span class="keyword"
-		  >pattern</span
-		  > <a id="v:Empty" class="def"
-		  >Empty</a
-		  > :: <a href="#"
-		  >Vec</a
-		  > 0 a</td
-		><td class="doc empty"
-		></td
-		></tr
-	      ><tr
 	      ><td class="src"
 		><span class="keyword"
 		  >pattern</span
 		  > <a id="v::-62-" class="def"
 		  >(:&gt;)</a
-		  > :: a -&gt; <a href="#"
+		  > :: a -&gt; <a href="#" title="BundledPatterns2"
 		  >Vec</a
-		  > n a -&gt; <a href="#"
+		  > n a -&gt; <a href="#" title="BundledPatterns2"
 		  >Vec</a
-		  > (n <a href="#"
+		  > (n <a href="#" title="Bug310"
 		  >+</a
 		  > 1) a <span class="fixity"
 		  >infixr 5</span
@@ -282,6 +270,18 @@
 </pre
 		  ></td
 		></tr
+	      ><tr
+	      ><td class="src"
+		><span class="keyword"
+		  >pattern</span
+		  > <a id="v:Empty" class="def"
+		  >Empty</a
+		  > :: <a href="#" title="BundledPatterns2"
+		  >Vec</a
+		  > 0 a</td
+		><td class="doc empty"
+		></td
+		></tr
 	      ></table
 	    ></div
 	  ></div
@@ -291,11 +291,11 @@
 	    >data</span
 	    > <a id="t:RTree" class="def"
 	    >RTree</a
-	    > :: <a href="#"
+	    > :: <a href="#" title="GHC.TypeNats"
 	    >Nat</a
-	    > -&gt; <a href="#"
+	    > -&gt; <a href="#" title="Data.Kind"
 	    >*</a
-	    > -&gt; <a href="#"
+	    > -&gt; <a href="#" title="Data.Kind"
 	    >*</a
 	    > <span class="keyword"
 	    >where</span
@@ -326,7 +326,7 @@
 		  >pattern</span
 		  > <a id="v:LR" class="def"
 		  >LR</a
-		  > :: a -&gt; <a href="#"
+		  > :: a -&gt; <a href="#" title="BundledPatterns2"
 		  >RTree</a
 		  > 0 a</td
 		><td class="doc"
@@ -392,13 +392,13 @@
 		  >pattern</span
 		  > <a id="v:BR" class="def"
 		  >BR</a
-		  > :: <a href="#"
+		  > :: <a href="#" title="BundledPatterns2"
 		  >RTree</a
-		  > d a -&gt; <a href="#"
+		  > d a -&gt; <a href="#" title="BundledPatterns2"
 		  >RTree</a
-		  > d a -&gt; <a href="#"
+		  > d a -&gt; <a href="#" title="BundledPatterns2"
 		  >RTree</a
-		  > (d <a href="#"
+		  > (d <a href="#" title="Bug310"
 		  >+</a
 		  > 1) a</td
 		><td class="doc"
-- 
cgit v1.2.3


From ce568c3afb00610d659d3c2bab022983d252f1cd Mon Sep 17 00:00:00 2001
From: Simon Jakobi <simon.jakobi@gmail.com>
Date: Wed, 13 Jun 2018 23:49:52 +0200
Subject: html-test: Accept output

---
 html-test/ref/A.html                             |  24 +-
 html-test/ref/Bug280.html                        |   4 +-
 html-test/ref/Bug294.html                        |  16 +-
 html-test/ref/Bug3.html                          |   8 +-
 html-test/ref/Bug310.html                        |  46 +--
 html-test/ref/Bug387.html                        |  16 +-
 html-test/ref/Bug4.html                          |   8 +-
 html-test/ref/Bug546.html                        |  20 +-
 html-test/ref/Bug548.html                        | 256 +++------------
 html-test/ref/Bug6.html                          |  60 +---
 html-test/ref/Bug613.html                        |  10 +-
 html-test/ref/Bug8.html                          |   4 +-
 html-test/ref/Bug85.html                         |  14 +-
 html-test/ref/BugDeprecated.html                 |  48 +--
 html-test/ref/BugExportHeadings.html             |  48 +--
 html-test/ref/Bugs.html                          |   4 +-
 html-test/ref/BundledPatterns.html               |  36 +-
 html-test/ref/BundledPatterns2.html              |  36 +-
 html-test/ref/ConstructorPatternExport.html      |  30 +-
 html-test/ref/DeprecatedFunction.html            |  16 +-
 html-test/ref/DeprecatedFunction2.html           |   8 +-
 html-test/ref/DeprecatedFunction3.html           |   8 +-
 html-test/ref/DeprecatedModule.html              |   4 +-
 html-test/ref/DeprecatedModule2.html             |   4 +-
 html-test/ref/DeprecatedNewtype.html             |  16 +-
 html-test/ref/DeprecatedReExport.html            |   8 +-
 html-test/ref/DeprecatedRecord.html              |  16 +-
 html-test/ref/DeprecatedTypeFamily.html          |  24 +-
 html-test/ref/DeprecatedTypeSynonym.html         |  16 +-
 html-test/ref/Examples.html                      |  16 +-
 html-test/ref/FunArgs.html                       |  16 +-
 html-test/ref/GADTRecords.html                   |  54 ++-
 html-test/ref/Hash.html                          |  96 ++----
 html-test/ref/HiddenInstances.html               |  26 +-
 html-test/ref/Hyperlinks.html                    |   8 +-
 html-test/ref/Instances.html                     | 398 ++++-------------------
 html-test/ref/Math.html                          |   8 +-
 html-test/ref/ModuleWithWarning.html             |   4 +-
 html-test/ref/NoLayout.html                      |   8 +-
 html-test/ref/Operators.html                     |   8 +-
 html-test/ref/OrphanInstances.html               |   4 +-
 html-test/ref/OrphanInstancesClass.html          |   8 +-
 html-test/ref/OrphanInstancesType.html           |   8 +-
 html-test/ref/PatternSyns.html                   |  32 +-
 html-test/ref/PromotedTypes.html                 |  28 +-
 html-test/ref/Properties.html                    |  16 +-
 html-test/ref/QuasiExpr.html                     |  80 +----
 html-test/ref/QuasiQuote.html                    |   4 +-
 html-test/ref/SpuriousSuperclassConstraints.html |  44 +--
 html-test/ref/TH.html                            |   6 +-
 html-test/ref/Test.html                          | 320 ++++--------------
 html-test/ref/Threaded.html                      |   8 +-
 html-test/ref/Threaded_TH.html                   |  12 +-
 html-test/ref/Ticket112.html                     |   4 +-
 html-test/ref/Ticket75.html                      |   8 +-
 html-test/ref/TitledPicture.html                 |  16 +-
 html-test/ref/TypeFamilies.html                  | 120 +++----
 html-test/ref/Unicode.html                       |   8 +-
 html-test/ref/Visible.html                       |   6 +-
 59 files changed, 460 insertions(+), 1722 deletions(-)

(limited to 'html-test/ref/BundledPatterns2.html')

diff --git a/html-test/ref/A.html b/html-test/ref/A.html
index e4802966..c6965abc 100644
--- a/html-test/ref/A.html
+++ b/html-test/ref/A.html
@@ -54,15 +54,11 @@
 	    ><li class="src short"
 	    ><a href="#"
 	      >other</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >test2</a
-	      > :: <a href="#" title="Data.Bool"
-	      >Bool</a
-	      ></li
+	      > :: Bool</li
 	    ><li class="src short"
 	    ><span class="keyword"
 	      >data</span
@@ -74,9 +70,7 @@
 	    ><li class="src short"
 	    ><a href="#"
 	      >reExport</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ></ul
 	  ></details
 	></div
@@ -111,9 +105,7 @@
 	><p class="src"
 	  ><a id="v:other" class="def"
 	    >other</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -121,9 +113,7 @@
 	><p class="src"
 	  ><a id="v:test2" class="def"
 	    >test2</a
-	    > :: <a href="#" title="Data.Bool"
-	    >Bool</a
-	    > <a href="#" class="selflink"
+	    > :: Bool <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -165,9 +155,7 @@
 	><p class="src"
 	  ><a id="v:reExport" class="def"
 	    >reExport</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/Bug280.html b/html-test/ref/Bug280.html
index d37fc11f..f2d25057 100644
--- a/html-test/ref/Bug280.html
+++ b/html-test/ref/Bug280.html
@@ -61,9 +61,7 @@
 	><p class="src"
 	  ><a id="v:x" class="def"
 	    >x</a
-	    > :: [<a href="#" title="Data.Char"
-	    >Char</a
-	    >] <a href="#" class="selflink"
+	    > :: [Char] <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
diff --git a/html-test/ref/Bug294.html b/html-test/ref/Bug294.html
index 0548646b..790c1894 100644
--- a/html-test/ref/Bug294.html
+++ b/html-test/ref/Bug294.html
@@ -171,9 +171,9 @@
 	><p class="src"
 	  ><a id="v:gadtField" class="def"
 	    >gadtField</a
-	    > :: ({..} -&gt; GADT <a href="#" title="Bug294"
+	    > :: GADT <a href="#" title="Bug294"
 	    >A</a
-	    >) -&gt; <a href="#" title="Bug294"
+	    > -&gt; <a href="#" title="Bug294"
 	    >A</a
 	    > <a href="#" class="selflink"
 	    >#</a
@@ -185,9 +185,7 @@
 	    >data family</span
 	    > <a id="t:TP" class="def"
 	    >TP</a
-	    > t :: <a href="#" title="Data.Kind"
-	    >*</a
-	    > <a href="#" class="selflink"
+	    > t :: * <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="subs instances"
@@ -247,9 +245,7 @@
 	    >data family</span
 	    > <a id="t:DP" class="def"
 	    >DP</a
-	    > t :: <a href="#" title="Data.Kind"
-	    >*</a
-	    > <a href="#" class="selflink"
+	    > t :: * <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="subs instances"
@@ -309,9 +305,7 @@
 	    >data family</span
 	    > <a id="t:TO-39-" class="def"
 	    >TO'</a
-	    > t :: <a href="#" title="Data.Kind"
-	    >*</a
-	    > <a href="#" class="selflink"
+	    > t :: * <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="subs instances"
diff --git a/html-test/ref/Bug3.html b/html-test/ref/Bug3.html
index 3c4b905c..2c716278 100644
--- a/html-test/ref/Bug3.html
+++ b/html-test/ref/Bug3.html
@@ -46,9 +46,7 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >foo</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ></ul
 	  ></details
 	></div
@@ -59,9 +57,7 @@
 	><p class="src"
 	  ><a id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/Bug310.html b/html-test/ref/Bug310.html
index 47da5387..e664eccd 100644
--- a/html-test/ref/Bug310.html
+++ b/html-test/ref/Bug310.html
@@ -38,28 +38,6 @@
 	><p class="caption"
 	>Bug310</p
 	></div
-      ><div id="synopsis"
-      ><details id="syn"
-	><summary
-	  >Synopsis</summary
-	  ><ul class="details-toggle" data-details-id="syn"
-	  ><li class="src short"
-	    ><span class="keyword"
-	      >type family</span
-	      > (a :: <a href="#" title="GHC.TypeNats"
-	      >Nat</a
-	      >) <a href="#"
-	      >+</a
-	      > (b :: <a href="#" title="GHC.TypeNats"
-	      >Nat</a
-	      >) :: <a href="#" title="GHC.TypeNats"
-	      >Nat</a
-	      > <span class="keyword"
-	      >where ...</span
-	      ></li
-	    ></ul
-	  ></details
-	></div
       ><div id="interface"
       ><h1
 	>Documentation</h1
@@ -67,31 +45,13 @@
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > (a :: <a href="#" title="GHC.TypeNats"
-	    >Nat</a
-	    >) <a id="t:-43-" class="def"
+	    > (a :: Nat) <a id="t:-43-" class="def"
 	    >+</a
-	    > (b :: <a href="#" title="GHC.TypeNats"
-	    >Nat</a
-	    >) :: <a href="#" title="GHC.TypeNats"
-	    >Nat</a
-	    > <span class="keyword"
+	    > (b :: Nat) :: Nat <span class="keyword"
 	    >where ...</span
-	    > <span class="fixity"
-	    >infixl 6</span
-	    ><span class="rightedge"
-	    ></span
 	    > <a href="#" class="selflink"
 	    >#</a
 	    ></p
-	  ><div class="doc"
-	  ><p
-	    >Addition of type-level naturals.</p
-	    ><p
-	    ><em
-	      >Since: base-4.7.0.0</em
-	      ></p
-	    ></div
 	  ></div
 	></div
       ></div
@@ -99,4 +59,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug387.html b/html-test/ref/Bug387.html
index ba2f5c91..da1b1ee5 100644
--- a/html-test/ref/Bug387.html
+++ b/html-test/ref/Bug387.html
@@ -60,15 +60,11 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >test1</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >test2</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ></ul
 	  ></details
 	></div
@@ -83,9 +79,7 @@
 	><p class="src"
 	  ><a id="v:test1" class="def"
 	    >test1</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -99,9 +93,7 @@
 	><p class="src"
 	  ><a id="v:test2" class="def"
 	    >test2</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
diff --git a/html-test/ref/Bug4.html b/html-test/ref/Bug4.html
index 6afd37fe..6bf822f7 100644
--- a/html-test/ref/Bug4.html
+++ b/html-test/ref/Bug4.html
@@ -46,9 +46,7 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >foo</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ></ul
 	  ></details
 	></div
@@ -59,9 +57,7 @@
 	><p class="src"
 	  ><a id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/Bug546.html b/html-test/ref/Bug546.html
index 221f7b6c..e2246475 100644
--- a/html-test/ref/Bug546.html
+++ b/html-test/ref/Bug546.html
@@ -46,17 +46,11 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >x</a
-	      > :: <a href="#" title="Prelude"
-	      >Integer</a
-	      ></li
+	      > :: Integer</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >compile</a
-	      > :: <a href="#" title="Data.String"
-	      >String</a
-	      > -&gt; <a href="#" title="Data.String"
-	      >String</a
-	      ></li
+	      > :: String -&gt; String</li
 	    ></ul
 	  ></details
 	></div
@@ -67,9 +61,7 @@
 	><p class="src"
 	  ><a id="v:x" class="def"
 	    >x</a
-	    > :: <a href="#" title="Prelude"
-	    >Integer</a
-	    > <a href="#" class="selflink"
+	    > :: Integer <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -89,11 +81,7 @@
 	><p class="src"
 	  ><a id="v:compile" class="def"
 	    >compile</a
-	    > :: <a href="#" title="Data.String"
-	    >String</a
-	    > -&gt; <a href="#" title="Data.String"
-	    >String</a
-	    > <a href="#" class="selflink"
+	    > :: String -&gt; String <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/Bug548.html b/html-test/ref/Bug548.html
index b32f8c8c..a8061eb2 100644
--- a/html-test/ref/Bug548.html
+++ b/html-test/ref/Bug548.html
@@ -47,13 +47,7 @@
 	    >newtype</span
 	    > <a id="t:WrappedArrow" class="def"
 	    >WrappedArrow</a
-	    > (a :: <a href="#" title="Data.Kind"
-	    >*</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    >) b c <a href="#" class="selflink"
+	    > (a :: * -&gt; * -&gt; *) b c <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="subs constructors"
@@ -98,15 +92,9 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:id:WrappedArrow:Generic1:1"
 		      ></span
-		      > <a href="#" title="GHC.Generics"
-		      >Generic1</a
-		      > (<a href="#" title="Bug548"
+		      > Generic1 (<a href="#" title="Bug548"
 		      >WrappedArrow</a
-		      > a b :: <a href="#" title="Data.Kind"
-		      >*</a
-		      > -&gt; <a href="#" title="Data.Kind"
-		      >*</a
-		      >)</span
+		      > a b :: * -&gt; *)</span
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -126,15 +114,9 @@
 			><p class="src"
 			><span class="keyword"
 			  >type</span
-			  > <a href="#" title="GHC.Generics"
-			  >Rep1</a
-			  > (<a href="#" title="Bug548"
-			  >WrappedArrow</a
-			  > a b) :: k -&gt; <a href="#" title="Data.Kind"
-			  >*</a
-			  > <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > Rep1 (<a href="#" title="Bug548"
+			  >WrappedArrow</a
+			  > a b) :: k -&gt; *</p
 			></div
 		      > <div class="subs methods"
 		      ><p class="caption"
@@ -144,25 +126,17 @@
 			  >from1</a
 			  > :: <a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b a0 -&gt; <a href="#" title="GHC.Generics"
-			  >Rep1</a
-			  > (<a href="#" title="Bug548"
+			  > a b a0 -&gt; Rep1 (<a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b) a0 <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > a b) a0</p
 			><p class="src"
 			><a href="#"
 			  >to1</a
-			  > :: <a href="#" title="GHC.Generics"
-			  >Rep1</a
-			  > (<a href="#" title="Bug548"
+			  > :: Rep1 (<a href="#" title="Bug548"
 			  >WrappedArrow</a
 			  > a b) a0 -&gt; <a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b a0 <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > a b a0</p
 			></div
 		      ></details
 		    ></td
@@ -172,20 +146,12 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:id:WrappedArrow:Functor:2"
 		      ></span
-		      > <a href="#" title="Control.Arrow"
-		      >Arrow</a
-		      > a =&gt; <a href="#" title="Data.Functor"
-		      >Functor</a
-		      > (<a href="#" title="Bug548"
+		      > Arrow a =&gt; Functor (<a href="#" title="Bug548"
 		      >WrappedArrow</a
 		      > a b)</span
 		    ></td
-		  ><td class="doc"
-		  ><p
-		    ><em
-		      >Since: base-2.1</em
-		      ></p
-		    ></td
+		  ><td class="doc empty"
+		  ></td
 		  ></tr
 		><tr
 		><td colspan="2"
@@ -206,9 +172,7 @@
 			  >WrappedArrow</a
 			  > a b a0 -&gt; <a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b b0 <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > a b b0</p
 			><p class="src"
 			><a href="#"
 			  >(&lt;$)</a
@@ -216,9 +180,7 @@
 			  >WrappedArrow</a
 			  > a b b0 -&gt; <a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b a0 <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > a b a0</p
 			></div
 		      ></details
 		    ></td
@@ -228,20 +190,12 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:id:WrappedArrow:Applicative:3"
 		      ></span
-		      > <a href="#" title="Control.Arrow"
-		      >Arrow</a
-		      > a =&gt; <a href="#" title="Control.Applicative"
-		      >Applicative</a
-		      > (<a href="#" title="Bug548"
+		      > Arrow a =&gt; Applicative (<a href="#" title="Bug548"
 		      >WrappedArrow</a
 		      > a b)</span
 		    ></td
-		  ><td class="doc"
-		  ><p
-		    ><em
-		      >Since: base-2.1</em
-		      ></p
-		    ></td
+		  ><td class="doc empty"
+		  ></td
 		  ></tr
 		><tr
 		><td colspan="2"
@@ -260,9 +214,7 @@
 			  >pure</a
 			  > :: a0 -&gt; <a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b a0 <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > a b a0</p
 			><p class="src"
 			><a href="#"
 			  >(&lt;*&gt;)</a
@@ -272,9 +224,7 @@
 			  >WrappedArrow</a
 			  > a b a0 -&gt; <a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b b0 <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > a b b0</p
 			><p class="src"
 			><a href="#"
 			  >liftA2</a
@@ -284,9 +234,7 @@
 			  >WrappedArrow</a
 			  > a b b0 -&gt; <a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b c <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > a b c</p
 			><p class="src"
 			><a href="#"
 			  >(*&gt;)</a
@@ -296,9 +244,7 @@
 			  >WrappedArrow</a
 			  > a b b0 -&gt; <a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b b0 <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > a b b0</p
 			><p class="src"
 			><a href="#"
 			  >(&lt;*)</a
@@ -308,9 +254,7 @@
 			  >WrappedArrow</a
 			  > a b b0 -&gt; <a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b a0 <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > a b a0</p
 			></div
 		      ></details
 		    ></td
@@ -320,22 +264,12 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:id:WrappedArrow:Alternative:4"
 		      ></span
-		      > (<a href="#" title="Control.Arrow"
-		      >ArrowZero</a
-		      > a, <a href="#" title="Control.Arrow"
-		      >ArrowPlus</a
-		      > a) =&gt; <a href="#" title="Control.Applicative"
-		      >Alternative</a
-		      > (<a href="#" title="Bug548"
+		      > (ArrowZero a, ArrowPlus a) =&gt; Alternative (<a href="#" title="Bug548"
 		      >WrappedArrow</a
 		      > a b)</span
 		    ></td
-		  ><td class="doc"
-		  ><p
-		    ><em
-		      >Since: base-2.1</em
-		      ></p
-		    ></td
+		  ><td class="doc empty"
+		  ></td
 		  ></tr
 		><tr
 		><td colspan="2"
@@ -354,9 +288,7 @@
 			  >empty</a
 			  > :: <a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b a0 <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > a b a0</p
 			><p class="src"
 			><a href="#"
 			  >(&lt;|&gt;)</a
@@ -366,9 +298,7 @@
 			  >WrappedArrow</a
 			  > a b a0 -&gt; <a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b a0 <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > a b a0</p
 			><p class="src"
 			><a href="#"
 			  >some</a
@@ -376,9 +306,7 @@
 			  >WrappedArrow</a
 			  > a b a0 -&gt; <a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b [a0] <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > a b [a0]</p
 			><p class="src"
 			><a href="#"
 			  >many</a
@@ -386,9 +314,7 @@
 			  >WrappedArrow</a
 			  > a b a0 -&gt; <a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b [a0] <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > a b [a0]</p
 			></div
 		      ></details
 		    ></td
@@ -398,9 +324,7 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:id:WrappedArrow:Generic:5"
 		      ></span
-		      > <a href="#" title="GHC.Generics"
-		      >Generic</a
-		      > (<a href="#" title="Bug548"
+		      > Generic (<a href="#" title="Bug548"
 		      >WrappedArrow</a
 		      > a b c)</span
 		    ></td
@@ -422,17 +346,9 @@
 			><p class="src"
 			><span class="keyword"
 			  >type</span
-			  > <a href="#" title="GHC.Generics"
-			  >Rep</a
-			  > (<a href="#" title="Bug548"
-			  >WrappedArrow</a
-			  > a b c) :: <a href="#" title="Data.Kind"
-			  >*</a
-			  > -&gt; <a href="#" title="Data.Kind"
-			  >*</a
-			  > <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > Rep (<a href="#" title="Bug548"
+			  >WrappedArrow</a
+			  > a b c) :: * -&gt; *</p
 			></div
 		      > <div class="subs methods"
 		      ><p class="caption"
@@ -442,25 +358,17 @@
 			  >from</a
 			  > :: <a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b c -&gt; <a href="#" title="GHC.Generics"
-			  >Rep</a
-			  > (<a href="#" title="Bug548"
+			  > a b c -&gt; Rep (<a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b c) x <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > a b c) x</p
 			><p class="src"
 			><a href="#"
 			  >to</a
-			  > :: <a href="#" title="GHC.Generics"
-			  >Rep</a
-			  > (<a href="#" title="Bug548"
+			  > :: Rep (<a href="#" title="Bug548"
 			  >WrappedArrow</a
 			  > a b c) x -&gt; <a href="#" title="Bug548"
 			  >WrappedArrow</a
-			  > a b c <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > a b c</p
 			></div
 		      ></details
 		    ></td
@@ -472,15 +380,9 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#" title="GHC.Generics"
-		      >Rep1</a
-		      > (<a href="#" title="Bug548"
+		      > Rep1 (<a href="#" title="Bug548"
 		      >WrappedArrow</a
-		      > a b :: <a href="#" title="Data.Kind"
-		      >*</a
-		      > -&gt; <a href="#" title="Data.Kind"
-		      >*</a
-		      >)</span
+		      > a b :: * -&gt; *)</span
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -497,43 +399,9 @@
 		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#" title="GHC.Generics"
-			>Rep1</a
-			> (<a href="#" title="Bug548"
+			> Rep1 (<a href="#" title="Bug548"
 			>WrappedArrow</a
-			> a b :: <a href="#" title="Data.Kind"
-			>*</a
-			> -&gt; <a href="#" title="Data.Kind"
-			>*</a
-			>) = <a href="#" title="GHC.Generics"
-			>D1</a
-			> (<a href="#" title="GHC.Generics"
-			>MetaData</a
-			> &quot;WrappedArrow&quot; &quot;Control.Applicative&quot; &quot;base&quot; <a href="#" title="Data.Bool"
-			>True</a
-			>) (<a href="#" title="GHC.Generics"
-			>C1</a
-			> (<a href="#" title="GHC.Generics"
-			>MetaCons</a
-			> &quot;WrapArrow&quot; <a href="#" title="GHC.Generics"
-			>PrefixI</a
-			> <a href="#" title="Data.Bool"
-			>True</a
-			>) (<a href="#" title="GHC.Generics"
-			>S1</a
-			> (<a href="#" title="GHC.Generics"
-			>MetaSel</a
-			> (<a href="#" title="Data.Maybe"
-			>Just</a
-			> &quot;unwrapArrow&quot;) <a href="#" title="GHC.Generics"
-			>NoSourceUnpackedness</a
-			> <a href="#" title="GHC.Generics"
-			>NoSourceStrictness</a
-			> <a href="#" title="GHC.Generics"
-			>DecidedLazy</a
-			>) (<a href="#" title="GHC.Generics"
-			>Rec1</a
-			> (a b))))</div
+			> a b :: * -&gt; *) = D1 (MetaData &quot;WrappedArrow&quot; &quot;Control.Applicative&quot; &quot;base&quot; True) (C1 (MetaCons &quot;WrapArrow&quot; PrefixI True) (S1 (MetaSel (Just &quot;unwrapArrow&quot;) NoSourceUnpackedness NoSourceStrictness DecidedLazy) (Rec1 (a b))))</div
 		      ></details
 		    ></td
 		  ></tr
@@ -544,9 +412,7 @@
 		      ></span
 		      > <span class="keyword"
 		      >type</span
-		      > <a href="#" title="GHC.Generics"
-		      >Rep</a
-		      > (<a href="#" title="Bug548"
+		      > Rep (<a href="#" title="Bug548"
 		      >WrappedArrow</a
 		      > a b c)</span
 		    ></td
@@ -565,39 +431,9 @@
 		      > <div class="src"
 		      ><span class="keyword"
 			>type</span
-			> <a href="#" title="GHC.Generics"
-			>Rep</a
-			> (<a href="#" title="Bug548"
+			> Rep (<a href="#" title="Bug548"
 			>WrappedArrow</a
-			> a b c) = <a href="#" title="GHC.Generics"
-			>D1</a
-			> (<a href="#" title="GHC.Generics"
-			>MetaData</a
-			> &quot;WrappedArrow&quot; &quot;Control.Applicative&quot; &quot;base&quot; <a href="#" title="Data.Bool"
-			>True</a
-			>) (<a href="#" title="GHC.Generics"
-			>C1</a
-			> (<a href="#" title="GHC.Generics"
-			>MetaCons</a
-			> &quot;WrapArrow&quot; <a href="#" title="GHC.Generics"
-			>PrefixI</a
-			> <a href="#" title="Data.Bool"
-			>True</a
-			>) (<a href="#" title="GHC.Generics"
-			>S1</a
-			> (<a href="#" title="GHC.Generics"
-			>MetaSel</a
-			> (<a href="#" title="Data.Maybe"
-			>Just</a
-			> &quot;unwrapArrow&quot;) <a href="#" title="GHC.Generics"
-			>NoSourceUnpackedness</a
-			> <a href="#" title="GHC.Generics"
-			>NoSourceStrictness</a
-			> <a href="#" title="GHC.Generics"
-			>DecidedLazy</a
-			>) (<a href="#" title="GHC.Generics"
-			>Rec0</a
-			> (a b c))))</div
+			> a b c) = D1 (MetaData &quot;WrappedArrow&quot; &quot;Control.Applicative&quot; &quot;base&quot; True) (C1 (MetaCons &quot;WrapArrow&quot; PrefixI True) (S1 (MetaSel (Just &quot;unwrapArrow&quot;) NoSourceUnpackedness NoSourceStrictness DecidedLazy) (Rec0 (a b c))))</div
 		      ></details
 		    ></td
 		  ></tr
@@ -611,4 +447,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug6.html b/html-test/ref/Bug6.html
index 15842547..27f73d64 100644
--- a/html-test/ref/Bug6.html
+++ b/html-test/ref/Bug6.html
@@ -58,9 +58,7 @@
 	      >A</a
 	      > = <a href="#"
 	      >A</a
-	      > <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > Int</li
 	    ><li class="src short"
 	    ><span class="keyword"
 	      >data</span
@@ -68,17 +66,13 @@
 	      >B</a
 	      > = <a href="#"
 	      >B</a
-	      > <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >b</a
 	      > :: <a href="#" title="Bug6"
 	      >B</a
-	      > -&gt; <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > -&gt; Int</li
 	    ><li class="src short"
 	    ><span class="keyword"
 	      >data</span
@@ -90,15 +84,11 @@
 	      ><li
 		><a href="#"
 		  >c1</a
-		  > :: <a href="#" title="Data.Int"
-		  >Int</a
-		  ></li
+		  > :: Int</li
 		><li
 		><a href="#"
 		  >c2</a
-		  > :: <a href="#" title="Data.Int"
-		  >Int</a
-		  ></li
+		  > :: Int</li
 		></ul
 	      >}</li
 	    ><li class="src short"
@@ -108,11 +98,7 @@
 	      >D</a
 	      > = <a href="#"
 	      >D</a
-	      > <a href="#" title="Data.Int"
-	      >Int</a
-	      > <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > Int Int</li
 	    ><li class="src short"
 	    ><span class="keyword"
 	      >newtype</span
@@ -120,9 +106,7 @@
 	      >E</a
 	      > = <a href="#"
 	      >E</a
-	      > <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > Int</li
 	    ></ul
 	  ></details
 	></div
@@ -150,9 +134,7 @@
 	      ><td class="src"
 		><a id="v:A" class="def"
 		  >A</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  ></td
+		  > Int</td
 		><td class="doc empty"
 		></td
 		></tr
@@ -181,9 +163,7 @@
 	      ><td class="src"
 		><a id="v:B" class="def"
 		  >B</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  ></td
+		  > Int</td
 		><td class="doc empty"
 		></td
 		></tr
@@ -196,9 +176,7 @@
 	    >b</a
 	    > :: <a href="#" title="Bug6"
 	    >B</a
-	    > -&gt; <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > -&gt; Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -237,9 +215,7 @@
 		      ><dfn class="src"
 			><a id="v:c1" class="def"
 			  >c1</a
-			  > :: <a href="#" title="Data.Int"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc empty"
 			></div
 			></li
@@ -247,9 +223,7 @@
 		      ><dfn class="src"
 			><a id="v:c2" class="def"
 			  >c2</a
-			  > :: <a href="#" title="Data.Int"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc empty"
 			></div
 			></li
@@ -282,11 +256,7 @@
 	      ><td class="src"
 		><a id="v:D" class="def"
 		  >D</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  ></td
+		  > Int Int</td
 		><td class="doc empty"
 		></td
 		></tr
@@ -314,9 +284,7 @@
 	      ><td class="src"
 		><a id="v:E" class="def"
 		  >E</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  ></td
+		  > Int</td
 		><td class="doc empty"
 		></td
 		></tr
diff --git a/html-test/ref/Bug613.html b/html-test/ref/Bug613.html
index 71e30832..e8089fc8 100644
--- a/html-test/ref/Bug613.html
+++ b/html-test/ref/Bug613.html
@@ -104,9 +104,7 @@
 		      ></span
 		      > <a href="#" title="Bug613"
 		      >Functor</a
-		      > (<a href="#" title="Data.Either"
-		      >Either</a
-		      > a)</span
+		      > (Either a)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -128,11 +126,7 @@
 			><p class="src"
 			><a href="#"
 			  >fmap</a
-			  > :: (a0 -&gt; b) -&gt; <a href="#" title="Data.Either"
-			  >Either</a
-			  > a a0 -&gt; <a href="#" title="Data.Either"
-			  >Either</a
-			  > a b <a href="#" class="selflink"
+			  > :: (a0 -&gt; b) -&gt; Either a a0 -&gt; Either a b <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html
index 9de7cca6..7aa562f2 100644
--- a/html-test/ref/Bug8.html
+++ b/html-test/ref/Bug8.html
@@ -99,9 +99,7 @@
 	><p class="src"
 	  ><a id="v:-45--45--45--62-" class="def"
 	    >(---&gt;)</a
-	    > :: <a href="#" title="Data.Foldable"
-	    >Foldable</a
-	    > t0 =&gt; t0 t -&gt; <a href="#" title="Bug8"
+	    > :: Foldable t0 =&gt; t0 t -&gt; <a href="#" title="Bug8"
 	    >Typ</a
 	    > -&gt; <a href="#" title="Bug8"
 	    >Typ</a
diff --git a/html-test/ref/Bug85.html b/html-test/ref/Bug85.html
index 4b704c5f..bf7e1465 100644
--- a/html-test/ref/Bug85.html
+++ b/html-test/ref/Bug85.html
@@ -47,15 +47,7 @@
 	    >data</span
 	    > <a id="t:Foo" class="def"
 	    >Foo</a
-	    > :: (<a href="#" title="Data.Kind"
-	    >*</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    >) -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > <span class="keyword"
+	    > :: (* -&gt; *) -&gt; * -&gt; * <span class="keyword"
 	    >where</span
 	    > <a href="#" class="selflink"
 	    >#</a
@@ -83,9 +75,7 @@
 	    >data</span
 	    > <a id="t:Baz" class="def"
 	    >Baz</a
-	    > :: <a href="#" title="Data.Kind"
-	    >*</a
-	    > <span class="keyword"
+	    > :: * <span class="keyword"
 	    >where</span
 	    > <a href="#" class="selflink"
 	    >#</a
diff --git a/html-test/ref/BugDeprecated.html b/html-test/ref/BugDeprecated.html
index 4efe3da2..393a78ab 100644
--- a/html-test/ref/BugDeprecated.html
+++ b/html-test/ref/BugDeprecated.html
@@ -46,39 +46,27 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >foo</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >bar</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >baz</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >one</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >two</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >three</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ></ul
 	  ></details
 	></div
@@ -89,9 +77,7 @@
 	><p class="src"
 	  ><a id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -105,9 +91,7 @@
 	><p class="src"
 	  ><a id="v:bar" class="def"
 	    >bar</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -121,9 +105,7 @@
 	><p class="src"
 	  ><a id="v:baz" class="def"
 	    >baz</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -137,9 +119,7 @@
 	><p class="src"
 	  ><a id="v:one" class="def"
 	    >one</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -155,9 +135,7 @@
 	><p class="src"
 	  ><a id="v:two" class="def"
 	    >two</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -171,9 +149,7 @@
 	><p class="src"
 	  ><a id="v:three" class="def"
 	    >three</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/BugExportHeadings.html b/html-test/ref/BugExportHeadings.html
index 78af3351..17378531 100644
--- a/html-test/ref/BugExportHeadings.html
+++ b/html-test/ref/BugExportHeadings.html
@@ -76,39 +76,27 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >foo</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >bar</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >baz</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >one</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >two</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >three</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ></ul
 	  ></details
 	></div
@@ -121,9 +109,7 @@
 	><p class="src"
 	  ><a id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -135,9 +121,7 @@
 	><p class="src"
 	  ><a id="v:bar" class="def"
 	    >bar</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -149,9 +133,7 @@
 	><p class="src"
 	  ><a id="v:baz" class="def"
 	    >baz</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -163,9 +145,7 @@
 	><p class="src"
 	  ><a id="v:one" class="def"
 	    >one</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -183,9 +163,7 @@
 	><p class="src"
 	  ><a id="v:two" class="def"
 	    >two</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -203,9 +181,7 @@
 	><p class="src"
 	  ><a id="v:three" class="def"
 	    >three</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/Bugs.html b/html-test/ref/Bugs.html
index abe20dc2..348ae6bc 100644
--- a/html-test/ref/Bugs.html
+++ b/html-test/ref/Bugs.html
@@ -58,9 +58,7 @@
 	      ><td class="src"
 		><a id="v:A" class="def"
 		  >A</a
-		  > a (a -&gt; <a href="#" title="Data.Int"
-		  >Int</a
-		  >)</td
+		  > a (a -&gt; Int)</td
 		><td class="doc empty"
 		></td
 		></tr
diff --git a/html-test/ref/BundledPatterns.html b/html-test/ref/BundledPatterns.html
index 7febd35f..7a602ae1 100644
--- a/html-test/ref/BundledPatterns.html
+++ b/html-test/ref/BundledPatterns.html
@@ -48,13 +48,7 @@
 	      >data</span
 	      > <a href="#"
 	      >Vec</a
-	      > :: <a href="#" title="GHC.TypeNats"
-	      >Nat</a
-	      > -&gt; <a href="#" title="Data.Kind"
-	      >*</a
-	      > -&gt; <a href="#" title="Data.Kind"
-	      >*</a
-	      > <span class="keyword"
+	      > :: Nat -&gt; * -&gt; * <span class="keyword"
 	      >where</span
 	      ><ul class="subs"
 	      ><li
@@ -82,13 +76,7 @@
 	      >data</span
 	      > <a href="#"
 	      >RTree</a
-	      > :: <a href="#" title="GHC.TypeNats"
-	      >Nat</a
-	      > -&gt; <a href="#" title="Data.Kind"
-	      >*</a
-	      > -&gt; <a href="#" title="Data.Kind"
-	      >*</a
-	      > <span class="keyword"
+	      > :: Nat -&gt; * -&gt; * <span class="keyword"
 	      >where</span
 	      ><ul class="subs"
 	      ><li
@@ -127,13 +115,7 @@
 	    >data</span
 	    > <a id="t:Vec" class="def"
 	    >Vec</a
-	    > :: <a href="#" title="GHC.TypeNats"
-	    >Nat</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > <span class="keyword"
+	    > :: Nat -&gt; * -&gt; * <span class="keyword"
 	    >where</span
 	    > <a href="#" class="selflink"
 	    >#</a
@@ -154,9 +136,7 @@
 		> subscript starting from 0 and
    ending at <code
 		><code
-		  ><a href="#" title="Data.Foldable"
-		    >length</a
-		    ></code
+		  >length</code
 		  > - 1</code
 		>.</li
 	      ></ul
@@ -293,13 +273,7 @@
 	    >data</span
 	    > <a id="t:RTree" class="def"
 	    >RTree</a
-	    > :: <a href="#" title="GHC.TypeNats"
-	    >Nat</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > <span class="keyword"
+	    > :: Nat -&gt; * -&gt; * <span class="keyword"
 	    >where</span
 	    > <a href="#" class="selflink"
 	    >#</a
diff --git a/html-test/ref/BundledPatterns2.html b/html-test/ref/BundledPatterns2.html
index 9e791c65..6a60c748 100644
--- a/html-test/ref/BundledPatterns2.html
+++ b/html-test/ref/BundledPatterns2.html
@@ -48,13 +48,7 @@
 	      >data</span
 	      > <a href="#"
 	      >Vec</a
-	      > :: <a href="#" title="GHC.TypeNats"
-	      >Nat</a
-	      > -&gt; <a href="#" title="Data.Kind"
-	      >*</a
-	      > -&gt; <a href="#" title="Data.Kind"
-	      >*</a
-	      > <span class="keyword"
+	      > :: Nat -&gt; * -&gt; * <span class="keyword"
 	      >where</span
 	      ><ul class="subs"
 	      ><li
@@ -84,13 +78,7 @@
 	      >data</span
 	      > <a href="#"
 	      >RTree</a
-	      > :: <a href="#" title="GHC.TypeNats"
-	      >Nat</a
-	      > -&gt; <a href="#" title="Data.Kind"
-	      >*</a
-	      > -&gt; <a href="#" title="Data.Kind"
-	      >*</a
-	      > <span class="keyword"
+	      > :: Nat -&gt; * -&gt; * <span class="keyword"
 	      >where</span
 	      ><ul class="subs"
 	      ><li
@@ -129,13 +117,7 @@
 	    >data</span
 	    > <a id="t:Vec" class="def"
 	    >Vec</a
-	    > :: <a href="#" title="GHC.TypeNats"
-	    >Nat</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > <span class="keyword"
+	    > :: Nat -&gt; * -&gt; * <span class="keyword"
 	    >where</span
 	    > <a href="#" class="selflink"
 	    >#</a
@@ -156,9 +138,7 @@
 		> subscript starting from 0 and
    ending at <code
 		><code
-		  ><a href="#" title="Data.Foldable"
-		    >length</a
-		    ></code
+		  >length</code
 		  > - 1</code
 		>.</li
 	      ></ul
@@ -291,13 +271,7 @@
 	    >data</span
 	    > <a id="t:RTree" class="def"
 	    >RTree</a
-	    > :: <a href="#" title="GHC.TypeNats"
-	    >Nat</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > <span class="keyword"
+	    > :: Nat -&gt; * -&gt; * <span class="keyword"
 	    >where</span
 	    > <a href="#" class="selflink"
 	    >#</a
diff --git a/html-test/ref/ConstructorPatternExport.html b/html-test/ref/ConstructorPatternExport.html
index 4e062e34..548cd729 100644
--- a/html-test/ref/ConstructorPatternExport.html
+++ b/html-test/ref/ConstructorPatternExport.html
@@ -47,9 +47,7 @@
 	    >pattern</span
 	    > <a id="v:FooCons" class="def"
 	    >FooCons</a
-	    > :: <a href="#" title="Data.String"
-	    >String</a
-	    > -&gt; a -&gt; Foo a <a href="#" class="selflink"
+	    > :: String -&gt; a -&gt; Foo a <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -59,11 +57,7 @@
 	    >pattern</span
 	    > <a id="v:MyRecCons" class="def"
 	    >MyRecCons</a
-	    > :: <a href="#" title="Data.Bool"
-	    >Bool</a
-	    > -&gt; <a href="#" title="Data.Int"
-	    >Int</a
-	    > -&gt; MyRec <a href="#" class="selflink"
+	    > :: Bool -&gt; Int -&gt; MyRec <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -73,9 +67,7 @@
 	    >pattern</span
 	    > <a id="v::-43-" class="def"
 	    >(:+)</a
-	    > :: <a href="#" title="Data.String"
-	    >String</a
-	    > -&gt; a -&gt; MyInfix a <a href="#" class="selflink"
+	    > :: String -&gt; a -&gt; MyInfix a <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -85,9 +77,7 @@
 	    >pattern</span
 	    > <a id="v:BlubCons" class="def"
 	    >BlubCons</a
-	    > :: () =&gt; <a href="#" title="Text.Show"
-	    >Show</a
-	    > b =&gt; b -&gt; Blub <a href="#" class="selflink"
+	    > :: () =&gt; Show b =&gt; b -&gt; Blub <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -97,17 +87,7 @@
 	    >pattern</span
 	    > <a id="v:MyGADTCons" class="def"
 	    >MyGADTCons</a
-	    > :: () =&gt; <span class="keyword"
-	    >forall</span
-	    > a. <a href="#" title="Data.Eq"
-	    >Eq</a
-	    > a =&gt; a -&gt; <a href="#" title="Data.Int"
-	    >Int</a
-	    > -&gt; MyGADT (<a href="#" title="Data.Maybe"
-	    >Maybe</a
-	    > <a href="#" title="Data.String"
-	    >String</a
-	    >) <a href="#" class="selflink"
+	    > :: a -&gt; Int -&gt; MyGADT (Maybe String) <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
diff --git a/html-test/ref/DeprecatedFunction.html b/html-test/ref/DeprecatedFunction.html
index b43526ba..5682128f 100644
--- a/html-test/ref/DeprecatedFunction.html
+++ b/html-test/ref/DeprecatedFunction.html
@@ -46,15 +46,11 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >foo</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >bar</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ></ul
 	  ></details
 	></div
@@ -65,9 +61,7 @@
 	><p class="src"
 	  ><a id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -87,9 +81,7 @@
 	><p class="src"
 	  ><a id="v:bar" class="def"
 	    >bar</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/DeprecatedFunction2.html b/html-test/ref/DeprecatedFunction2.html
index db0098b2..d4e19e7a 100644
--- a/html-test/ref/DeprecatedFunction2.html
+++ b/html-test/ref/DeprecatedFunction2.html
@@ -46,9 +46,7 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >foo</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ></ul
 	  ></details
 	></div
@@ -59,9 +57,7 @@
 	><p class="src"
 	  ><a id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/DeprecatedFunction3.html b/html-test/ref/DeprecatedFunction3.html
index 950c5203..58cffae8 100644
--- a/html-test/ref/DeprecatedFunction3.html
+++ b/html-test/ref/DeprecatedFunction3.html
@@ -46,9 +46,7 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >foo</a
-	      > :: <a href="#" title="Prelude"
-	      >Integer</a
-	      ></li
+	      > :: Integer</li
 	    ></ul
 	  ></details
 	></div
@@ -59,9 +57,7 @@
 	><p class="src"
 	  ><a id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href="#" title="Prelude"
-	    >Integer</a
-	    > <a href="#" class="selflink"
+	    > :: Integer <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/DeprecatedModule.html b/html-test/ref/DeprecatedModule.html
index 91150577..eb92dad9 100644
--- a/html-test/ref/DeprecatedModule.html
+++ b/html-test/ref/DeprecatedModule.html
@@ -61,9 +61,7 @@
 	><p class="src"
 	  ><a id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
diff --git a/html-test/ref/DeprecatedModule2.html b/html-test/ref/DeprecatedModule2.html
index 6688781f..81f2e024 100644
--- a/html-test/ref/DeprecatedModule2.html
+++ b/html-test/ref/DeprecatedModule2.html
@@ -55,9 +55,7 @@
 	><p class="src"
 	  ><a id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
diff --git a/html-test/ref/DeprecatedNewtype.html b/html-test/ref/DeprecatedNewtype.html
index 8158f61d..2640cbb5 100644
--- a/html-test/ref/DeprecatedNewtype.html
+++ b/html-test/ref/DeprecatedNewtype.html
@@ -50,9 +50,7 @@
 	      >SomeNewType</a
 	      > = <a href="#"
 	      >SomeNewTypeConst</a
-	      > <a href="#" title="Data.String"
-	      >String</a
-	      ></li
+	      > String</li
 	    ><li class="src short"
 	    ><span class="keyword"
 	      >newtype</span
@@ -60,9 +58,7 @@
 	      >SomeOtherNewType</a
 	      > = <a href="#"
 	      >SomeOtherNewTypeConst</a
-	      > <a href="#" title="Data.String"
-	      >String</a
-	      ></li
+	      > String</li
 	    ></ul
 	  ></details
 	></div
@@ -94,9 +90,7 @@
 	      ><td class="src"
 		><a id="v:SomeNewTypeConst" class="def"
 		  >SomeNewTypeConst</a
-		  > <a href="#" title="Data.String"
-		  >String</a
-		  ></td
+		  > String</td
 		><td class="doc"
 		><div class="warning"
 		  ><p
@@ -132,9 +126,7 @@
 	      ><td class="src"
 		><a id="v:SomeOtherNewTypeConst" class="def"
 		  >SomeOtherNewTypeConst</a
-		  > <a href="#" title="Data.String"
-		  >String</a
-		  ></td
+		  > String</td
 		><td class="doc"
 		><div class="warning"
 		  ><p
diff --git a/html-test/ref/DeprecatedReExport.html b/html-test/ref/DeprecatedReExport.html
index f2bbb766..214be4f4 100644
--- a/html-test/ref/DeprecatedReExport.html
+++ b/html-test/ref/DeprecatedReExport.html
@@ -72,9 +72,7 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >foo</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ></ul
 	  ></details
 	></div
@@ -87,9 +85,7 @@
 	><p class="src"
 	  ><a id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/DeprecatedRecord.html b/html-test/ref/DeprecatedRecord.html
index c2de1538..5ff532a4 100644
--- a/html-test/ref/DeprecatedRecord.html
+++ b/html-test/ref/DeprecatedRecord.html
@@ -54,15 +54,11 @@
 	      ><li
 		><a href="#"
 		  >fooName</a
-		  > :: <a href="#" title="Data.String"
-		  >String</a
-		  ></li
+		  > :: String</li
 		><li
 		><a href="#"
 		  >fooValue</a
-		  > :: <a href="#" title="Data.Int"
-		  >Int</a
-		  ></li
+		  > :: Int</li
 		></ul
 	      >}</li
 	    ></ul
@@ -106,9 +102,7 @@
 		      ><dfn class="src"
 			><a id="v:fooName" class="def"
 			  >fooName</a
-			  > :: <a href="#" title="Data.String"
-			  >String</a
-			  ></dfn
+			  > :: String</dfn
 			><div class="doc"
 			><p
 			  >some name</p
@@ -118,9 +112,7 @@
 		      ><dfn class="src"
 			><a id="v:fooValue" class="def"
 			  >fooValue</a
-			  > :: <a href="#" title="Data.Int"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc"
 			><div class="warning"
 			  ><p
diff --git a/html-test/ref/DeprecatedTypeFamily.html b/html-test/ref/DeprecatedTypeFamily.html
index fd13e48a..dab7683d 100644
--- a/html-test/ref/DeprecatedTypeFamily.html
+++ b/html-test/ref/DeprecatedTypeFamily.html
@@ -48,21 +48,13 @@
 	      >data family</span
 	      > <a href="#"
 	      >SomeTypeFamily</a
-	      > k :: <a href="#" title="Data.Kind"
-	      >*</a
-	      > -&gt; <a href="#" title="Data.Kind"
-	      >*</a
-	      ></li
+	      > k :: * -&gt; *</li
 	    ><li class="src short"
 	    ><span class="keyword"
 	      >data family</span
 	      > <a href="#"
 	      >SomeOtherTypeFamily</a
-	      > k :: <a href="#" title="Data.Kind"
-	      >*</a
-	      > -&gt; <a href="#" title="Data.Kind"
-	      >*</a
-	      ></li
+	      > k :: * -&gt; *</li
 	    ></ul
 	  ></details
 	></div
@@ -75,11 +67,7 @@
 	    >data family</span
 	    > <a id="t:SomeTypeFamily" class="def"
 	    >SomeTypeFamily</a
-	    > k :: <a href="#" title="Data.Kind"
-	    >*</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > <a href="#" class="selflink"
+	    > k :: * -&gt; * <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -97,11 +85,7 @@
 	    >data family</span
 	    > <a id="t:SomeOtherTypeFamily" class="def"
 	    >SomeOtherTypeFamily</a
-	    > k :: <a href="#" title="Data.Kind"
-	    >*</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > <a href="#" class="selflink"
+	    > k :: * -&gt; * <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/DeprecatedTypeSynonym.html b/html-test/ref/DeprecatedTypeSynonym.html
index fcb7f5ce..25526d72 100644
--- a/html-test/ref/DeprecatedTypeSynonym.html
+++ b/html-test/ref/DeprecatedTypeSynonym.html
@@ -48,17 +48,13 @@
 	      >type</span
 	      > <a href="#"
 	      >TypeSyn</a
-	      > = <a href="#" title="Data.String"
-	      >String</a
-	      ></li
+	      > = String</li
 	    ><li class="src short"
 	    ><span class="keyword"
 	      >type</span
 	      > <a href="#"
 	      >OtherTypeSyn</a
-	      > = <a href="#" title="Data.String"
-	      >String</a
-	      ></li
+	      > = String</li
 	    ></ul
 	  ></details
 	></div
@@ -71,9 +67,7 @@
 	    >type</span
 	    > <a id="t:TypeSyn" class="def"
 	    >TypeSyn</a
-	    > = <a href="#" title="Data.String"
-	    >String</a
-	    > <a href="#" class="selflink"
+	    > = String <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -91,9 +85,7 @@
 	    >type</span
 	    > <a id="t:OtherTypeSyn" class="def"
 	    >OtherTypeSyn</a
-	    > = <a href="#" title="Data.String"
-	    >String</a
-	    > <a href="#" class="selflink"
+	    > = String <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/Examples.html b/html-test/ref/Examples.html
index 77a341f0..7eeb5f7c 100644
--- a/html-test/ref/Examples.html
+++ b/html-test/ref/Examples.html
@@ -46,11 +46,7 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >fib</a
-	      > :: <a href="#" title="Prelude"
-	      >Integer</a
-	      > -&gt; <a href="#" title="Prelude"
-	      >Integer</a
-	      ></li
+	      > :: Integer -&gt; Integer</li
 	    ></ul
 	  ></details
 	></div
@@ -61,19 +57,13 @@
 	><p class="src"
 	  ><a id="v:fib" class="def"
 	    >fib</a
-	    > :: <a href="#" title="Prelude"
-	    >Integer</a
-	    > -&gt; <a href="#" title="Prelude"
-	    >Integer</a
-	    > <a href="#" class="selflink"
+	    > :: Integer -&gt; Integer <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Fibonacci number of given <code
-	      ><a href="#" title="Prelude"
-		>Integer</a
-		></code
+	      >Integer</code
 	      >.</p
 	    ><p
 	    >Examples:</p
diff --git a/html-test/ref/FunArgs.html b/html-test/ref/FunArgs.html
index 97c9a3c5..ae890105 100644
--- a/html-test/ref/FunArgs.html
+++ b/html-test/ref/FunArgs.html
@@ -54,17 +54,13 @@
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: <a href="#" title="Data.Ord"
-		  >Ord</a
-		  > a</td
+		>:: Ord a</td
 		><td class="doc empty"
 		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		>=&gt; <a href="#" title="Data.Int"
-		  >Int</a
-		  ></td
+		>=&gt; Int</td
 		><td class="doc"
 		><p
 		  >First argument</p
@@ -80,9 +76,7 @@
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href="#" title="Data.Bool"
-		  >Bool</a
-		  ></td
+		>-&gt; Bool</td
 		><td class="doc"
 		><p
 		  >Third argument</p
@@ -214,9 +208,7 @@
 	      ><td class="src"
 		>:: <span class="keyword"
 		  >forall</span
-		  > (b :: ()). d ~ <a href="#" title="GHC.Tuple"
-		  >()</a
-		  ></td
+		  > (b :: ()). d ~ ()</td
 		><td class="doc empty"
 		></td
 		></tr
diff --git a/html-test/ref/GADTRecords.html b/html-test/ref/GADTRecords.html
index 7fb5c4d6..1f0c87e8 100644
--- a/html-test/ref/GADTRecords.html
+++ b/html-test/ref/GADTRecords.html
@@ -60,9 +60,7 @@
 		><li
 		><a href="#"
 		  >C2</a
-		  > :: <a href="#" title="Data.Ord"
-		  >Ord</a
-		  > a =&gt; [a] -&gt; <a href="#" title="GADTRecords"
+		  > :: Ord a =&gt; [a] -&gt; <a href="#" title="GADTRecords"
 		  >H1</a
 		  > a a</li
 		><li
@@ -70,19 +68,13 @@
 		  >C3</a
 		  > :: {..} -&gt; <a href="#" title="GADTRecords"
 		  >H1</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  ></li
+		  > Int Int</li
 		><li
 		><a href="#"
 		  >C4</a
 		  > :: {..} -&gt; <a href="#" title="GADTRecords"
 		  >H1</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  > a</li
+		  > Int a</li
 		></ul
 	      ></li
 	    ></ul
@@ -124,9 +116,7 @@
 	      ><td class="src"
 		><a id="v:C2" class="def"
 		  >C2</a
-		  > :: <a href="#" title="Data.Ord"
-		  >Ord</a
-		  > a =&gt; [a] -&gt; <a href="#" title="GADTRecords"
+		  > :: Ord a =&gt; [a] -&gt; <a href="#" title="GADTRecords"
 		  >H1</a
 		  > a a</td
 		><td class="doc empty"
@@ -136,12 +126,6 @@
 	      ><td class="src"
 		><a id="v:C3" class="def"
 		  >C3</a
-		  > :: {..} -&gt; <a href="#" title="GADTRecords"
-		  >H1</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
 		  ></td
 		><td class="doc empty"
 		></td
@@ -154,16 +138,22 @@
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a id="v:field" class="def"
+			>:: { <a id="v:field" class="def"
 			  >field</a
-			  > :: <a href="#" title="Data.Int"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc"
 			><p
 			  >hello docs</p
 			  ></div
 			></li
+		      ><li
+		      ><dfn class="src"
+			>} -&gt; <a href="#" title="GADTRecords"
+			  >H1</a
+			  > Int Int</dfn
+			><div class="doc empty"
+			></div
+			></li
 		      ></ul
 		    ></div
 		  ></td
@@ -172,11 +162,7 @@
 	      ><td class="src"
 		><a id="v:C4" class="def"
 		  >C4</a
-		  > :: {..} -&gt; <a href="#" title="GADTRecords"
-		  >H1</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  > a</td
+		  ></td
 		><td class="doc empty"
 		></td
 		></tr
@@ -188,7 +174,7 @@
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a id="v:field2" class="def"
+			>:: { <a id="v:field2" class="def"
 			  >field2</a
 			  > :: a</dfn
 			><div class="doc"
@@ -196,6 +182,14 @@
 			  >hello2 docs</p
 			  ></div
 			></li
+		      ><li
+		      ><dfn class="src"
+			>} -&gt; <a href="#" title="GADTRecords"
+			  >H1</a
+			  > Int a</dfn
+			><div class="doc empty"
+			></div
+			></li
 		      ></ul
 		    ></div
 		  ></td
diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html
index 517428fa..c4f04f2c 100644
--- a/html-test/ref/Hash.html
+++ b/html-test/ref/Hash.html
@@ -87,37 +87,23 @@
 	    ><li class="src short"
 	    ><a href="#"
 	      >new</a
-	      > :: (<a href="#" title="Data.Eq"
-	      >Eq</a
-	      > key, <a href="#" title="Hash"
+	      > :: (Eq key, <a href="#" title="Hash"
 	      >Hash</a
-	      > key) =&gt; <a href="#" title="Data.Int"
-	      >Int</a
-	      > -&gt; <a href="#" title="System.IO"
-	      >IO</a
-	      > (<a href="#" title="Hash"
+	      > key) =&gt; Int -&gt; IO (<a href="#" title="Hash"
 	      >HashTable</a
 	      > key val)</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >insert</a
-	      > :: (<a href="#" title="Data.Eq"
-	      >Eq</a
-	      > key, <a href="#" title="Hash"
+	      > :: (Eq key, <a href="#" title="Hash"
 	      >Hash</a
-	      > key) =&gt; key -&gt; val -&gt; <a href="#" title="System.IO"
-	      >IO</a
-	      > ()</li
+	      > key) =&gt; key -&gt; val -&gt; IO ()</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >lookup</a
 	      > :: <a href="#" title="Hash"
 	      >Hash</a
-	      > key =&gt; key -&gt; <a href="#" title="System.IO"
-	      >IO</a
-	      > (<a href="#" title="Data.Maybe"
-	      >Maybe</a
-	      > val)</li
+	      > key =&gt; key -&gt; IO (Maybe val)</li
 	    ><li class="src short"
 	    ><span class="keyword"
 	      >class</span
@@ -129,9 +115,7 @@
 	      ><li
 		><a href="#"
 		  >hash</a
-		  > :: a -&gt; <a href="#" title="Data.Int"
-		  >Int</a
-		  ></li
+		  > :: a -&gt; Int</li
 		></ul
 	      ></li
 	    ></ul
@@ -163,9 +147,7 @@
  The type <code
 	      >key</code
 	      > should be an instance of <code
-	      ><a href="#" title="Data.Eq"
-		>Eq</a
-		></code
+	      >Eq</code
 	      >.</p
 	    ></div
 	  ></div
@@ -179,15 +161,9 @@
 	><p class="src"
 	  ><a id="v:new" class="def"
 	    >new</a
-	    > :: (<a href="#" title="Data.Eq"
-	    >Eq</a
-	    > key, <a href="#" title="Hash"
+	    > :: (Eq key, <a href="#" title="Hash"
 	    >Hash</a
-	    > key) =&gt; <a href="#" title="Data.Int"
-	    >Int</a
-	    > -&gt; <a href="#" title="System.IO"
-	    >IO</a
-	    > (<a href="#" title="Hash"
+	    > key) =&gt; Int -&gt; IO (<a href="#" title="Hash"
 	    >HashTable</a
 	    > key val) <a href="#" class="selflink"
 	    >#</a
@@ -201,13 +177,9 @@
 	><p class="src"
 	  ><a id="v:insert" class="def"
 	    >insert</a
-	    > :: (<a href="#" title="Data.Eq"
-	    >Eq</a
-	    > key, <a href="#" title="Hash"
+	    > :: (Eq key, <a href="#" title="Hash"
 	    >Hash</a
-	    > key) =&gt; key -&gt; val -&gt; <a href="#" title="System.IO"
-	    >IO</a
-	    > () <a href="#" class="selflink"
+	    > key) =&gt; key -&gt; val -&gt; IO () <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -221,26 +193,18 @@
 	    >lookup</a
 	    > :: <a href="#" title="Hash"
 	    >Hash</a
-	    > key =&gt; key -&gt; <a href="#" title="System.IO"
-	    >IO</a
-	    > (<a href="#" title="Data.Maybe"
-	    >Maybe</a
-	    > val) <a href="#" class="selflink"
+	    > key =&gt; key -&gt; IO (Maybe val) <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Looks up a key in the hash table, returns <code
 	      ><code
-		><a href="#" title="Data.Maybe"
-		  >Just</a
-		  ></code
+		>Just</code
 		> val</code
 	      > if the key
  was found, or <code
-	      ><a href="#" title="Data.Maybe"
-		>Nothing</a
-		></code
+	      >Nothing</code
 	      > otherwise.</p
 	    ></div
 	  ></div
@@ -271,9 +235,7 @@
 	    ><p class="src"
 	    ><a id="v:hash" class="def"
 	      >hash</a
-	      > :: a -&gt; <a href="#" title="Data.Int"
-	      >Int</a
-	      > <a href="#" class="selflink"
+	      > :: a -&gt; Int <a href="#" class="selflink"
 	      >#</a
 	      ></p
 	    ><div class="doc"
@@ -281,9 +243,7 @@
 	      >hashes the value of type <code
 		>a</code
 		> into an <code
-		><a href="#" title="Data.Int"
-		  >Int</a
-		  ></code
+		>Int</code
 		></p
 	      ></div
 	    ></div
@@ -299,9 +259,7 @@
 		      ></span
 		      > <a href="#" title="Hash"
 		      >Hash</a
-		      > <a href="#" title="Prelude"
-		      >Float</a
-		      ></span
+		      > Float</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -323,11 +281,7 @@
 			><p class="src"
 			><a href="#"
 			  >hash</a
-			  > :: <a href="#" title="Prelude"
-			  >Float</a
-			  > -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > <a href="#" class="selflink"
+			  > :: Float -&gt; Int <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -341,9 +295,7 @@
 		      ></span
 		      > <a href="#" title="Hash"
 		      >Hash</a
-		      > <a href="#" title="Data.Int"
-		      >Int</a
-		      ></span
+		      > Int</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -365,11 +317,7 @@
 			><p class="src"
 			><a href="#"
 			  >hash</a
-			  > :: <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > <a href="#" class="selflink"
+			  > :: Int -&gt; Int <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -409,9 +357,7 @@
 			><p class="src"
 			><a href="#"
 			  >hash</a
-			  > :: (a, b) -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > <a href="#" class="selflink"
+			  > :: (a, b) -&gt; Int <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
diff --git a/html-test/ref/HiddenInstances.html b/html-test/ref/HiddenInstances.html
index 9594d8e1..eb39dafc 100644
--- a/html-test/ref/HiddenInstances.html
+++ b/html-test/ref/HiddenInstances.html
@@ -86,9 +86,7 @@
 		      ></span
 		      > <a href="#" title="HiddenInstances"
 		      >VisibleClass</a
-		      > <a href="#" title="Data.Int"
-		      >Int</a
-		      ></span
+		      > Int</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -166,9 +164,7 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:id:VisibleData:Num:1"
 		      ></span
-		      > <a href="#" title="Prelude"
-		      >Num</a
-		      > <a href="#" title="HiddenInstances"
+		      > Num <a href="#" title="HiddenInstances"
 		      >VisibleData</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -200,8 +196,6 @@
 			  >VisibleData</a
 			  > -&gt; <a href="#" title="HiddenInstances"
 			  >VisibleData</a
-			  > <a href="#" class="selflink"
-			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -212,8 +206,6 @@
 			  >VisibleData</a
 			  > -&gt; <a href="#" title="HiddenInstances"
 			  >VisibleData</a
-			  > <a href="#" class="selflink"
-			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -224,8 +216,6 @@
 			  >VisibleData</a
 			  > -&gt; <a href="#" title="HiddenInstances"
 			  >VisibleData</a
-			  > <a href="#" class="selflink"
-			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -234,8 +224,6 @@
 			  >VisibleData</a
 			  > -&gt; <a href="#" title="HiddenInstances"
 			  >VisibleData</a
-			  > <a href="#" class="selflink"
-			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -244,8 +232,6 @@
 			  >VisibleData</a
 			  > -&gt; <a href="#" title="HiddenInstances"
 			  >VisibleData</a
-			  > <a href="#" class="selflink"
-			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -254,18 +240,12 @@
 			  >VisibleData</a
 			  > -&gt; <a href="#" title="HiddenInstances"
 			  >VisibleData</a
-			  > <a href="#" class="selflink"
-			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >fromInteger</a
-			  > :: <a href="#" title="Prelude"
-			  >Integer</a
-			  > -&gt; <a href="#" title="HiddenInstances"
+			  > :: Integer -&gt; <a href="#" title="HiddenInstances"
 			  >VisibleData</a
-			  > <a href="#" class="selflink"
-			  >#</a
 			  ></p
 			></div
 		      ></details
diff --git a/html-test/ref/Hyperlinks.html b/html-test/ref/Hyperlinks.html
index f331e741..58d012a5 100644
--- a/html-test/ref/Hyperlinks.html
+++ b/html-test/ref/Hyperlinks.html
@@ -46,9 +46,7 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >foo</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ></ul
 	  ></details
 	></div
@@ -59,9 +57,7 @@
 	><p class="src"
 	  ><a id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/Instances.html b/html-test/ref/Instances.html
index 1b4f276f..40b1045c 100644
--- a/html-test/ref/Instances.html
+++ b/html-test/ref/Instances.html
@@ -102,9 +102,7 @@
 			  >foo</a
 			  > :: (a <a href="#" title="Instances"
 			  >&lt;~~</a
-			  > <a href="#" title="Data.Int"
-			  >Int</a
-			  >) -&gt; a0 -&gt; a <a href="#" title="Instances"
+			  > Int) -&gt; a0 -&gt; a <a href="#" title="Instances"
 			  >&lt;~~</a
 			  > a0 <a href="#" class="selflink"
 			  >#</a
@@ -116,15 +114,11 @@
 			  >&lt;~~</a
 			  > (a <a href="#" title="Instances"
 			  >&lt;~~</a
-			  > a0)) -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; a <a href="#" title="Instances"
+			  > a0)) -&gt; Int -&gt; a <a href="#" title="Instances"
 			  >&lt;~~</a
 			  > (a <a href="#" title="Instances"
 			  >&lt;~~</a
-			  > <a href="#" title="Data.Int"
-			  >Int</a
-			  >) <a href="#" class="selflink"
+			  > Int) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -158,19 +152,13 @@
 	    ><p class="src"
 	    ><a id="v:foo" class="def"
 	      >foo</a
-	      > :: f <a href="#" title="Data.Int"
-	      >Int</a
-	      > -&gt; a -&gt; f a <a href="#" class="selflink"
+	      > :: f Int -&gt; a -&gt; f a <a href="#" class="selflink"
 	      >#</a
 	      ></p
 	    ><p class="src"
 	    ><a id="v:foo-39-" class="def"
 	      >foo'</a
-	      > :: f (f a) -&gt; <a href="#" title="Data.Int"
-	      >Int</a
-	      > -&gt; f (f <a href="#" title="Data.Int"
-	      >Int</a
-	      >) <a href="#" class="selflink"
+	      > :: f (f a) -&gt; Int -&gt; f (f Int) <a href="#" class="selflink"
 	      >#</a
 	      ></p
 	    ></div
@@ -208,19 +196,13 @@
 			><p class="src"
 			><a href="#"
 			  >foo</a
-			  > :: [<a href="#" title="Data.Int"
-			  >Int</a
-			  >] -&gt; a -&gt; [a] <a href="#" class="selflink"
+			  > :: [Int] -&gt; a -&gt; [a] <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
-			  > :: [[a]] -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; [[<a href="#" title="Data.Int"
-			  >Int</a
-			  >]] <a href="#" class="selflink"
+			  > :: [[a]] -&gt; Int -&gt; [[Int]] <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -234,9 +216,7 @@
 		      ></span
 		      > <a href="#" title="Instances"
 		      >Foo</a
-		      > <a href="#" title="Data.Maybe"
-		      >Maybe</a
-		      ></span
+		      > Maybe</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -258,31 +238,13 @@
 			><p class="src"
 			><a href="#"
 			  >foo</a
-			  > :: <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; a -&gt; <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > a <a href="#" class="selflink"
+			  > :: Maybe Int -&gt; a -&gt; Maybe a <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
-			  > :: <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > a) -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > <a href="#" title="Data.Int"
-			  >Int</a
-			  >) <a href="#" class="selflink"
+			  > :: Maybe (Maybe a) -&gt; Int -&gt; Maybe (Maybe Int) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -296,9 +258,7 @@
 		      ></span
 		      > <a href="#" title="Instances"
 		      >Foo</a
-		      > (<a href="#" title="Data.Either"
-		      >Either</a
-		      > a)</span
+		      > (Either a)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -320,31 +280,13 @@
 			><p class="src"
 			><a href="#"
 			  >foo</a
-			  > :: <a href="#" title="Data.Either"
-			  >Either</a
-			  > a <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; a0 -&gt; <a href="#" title="Data.Either"
-			  >Either</a
-			  > a a0 <a href="#" class="selflink"
+			  > :: Either a Int -&gt; a0 -&gt; Either a a0 <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
-			  > :: <a href="#" title="Data.Either"
-			  >Either</a
-			  > a (<a href="#" title="Data.Either"
-			  >Either</a
-			  > a a0) -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; <a href="#" title="Data.Either"
-			  >Either</a
-			  > a (<a href="#" title="Data.Either"
-			  >Either</a
-			  > a <a href="#" title="Data.Int"
-			  >Int</a
-			  >) <a href="#" class="selflink"
+			  > :: Either a (Either a a0) -&gt; Int -&gt; Either a (Either a Int) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -356,15 +298,11 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:ic:Foo:Foo:4"
 		      ></span
-		      > (<a href="#" title="Data.Eq"
-		      >Eq</a
-		      > a, <a href="#" title="Instances"
+		      > (Eq a, <a href="#" title="Instances"
 		      >Foo</a
 		      > f) =&gt; <a href="#" title="Instances"
 		      >Foo</a
-		      > (<a href="#" title="GHC.Tuple"
-		      >(,)</a
-		      > (f a))</span
+		      > ((,) (f a))</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -386,19 +324,13 @@
 			><p class="src"
 			><a href="#"
 			  >foo</a
-			  > :: (f a, <a href="#" title="Data.Int"
-			  >Int</a
-			  >) -&gt; a0 -&gt; (f a, a0) <a href="#" class="selflink"
+			  > :: (f a, Int) -&gt; a0 -&gt; (f a, a0) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
-			  > :: (f a, (f a, a0)) -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; (f a, (f a, <a href="#" title="Data.Int"
-			  >Int</a
-			  >)) <a href="#" class="selflink"
+			  > :: (f a, (f a, a0)) -&gt; Int -&gt; (f a, (f a, Int)) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -438,9 +370,7 @@
 			  >foo</a
 			  > :: (a <a href="#" title="Instances"
 			  >&lt;~~</a
-			  > <a href="#" title="Data.Int"
-			  >Int</a
-			  >) -&gt; a0 -&gt; a <a href="#" title="Instances"
+			  > Int) -&gt; a0 -&gt; a <a href="#" title="Instances"
 			  >&lt;~~</a
 			  > a0 <a href="#" class="selflink"
 			  >#</a
@@ -452,15 +382,11 @@
 			  >&lt;~~</a
 			  > (a <a href="#" title="Instances"
 			  >&lt;~~</a
-			  > a0)) -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; a <a href="#" title="Instances"
+			  > a0)) -&gt; Int -&gt; a <a href="#" title="Instances"
 			  >&lt;~~</a
 			  > (a <a href="#" title="Instances"
 			  >&lt;~~</a
-			  > <a href="#" title="Data.Int"
-			  >Int</a
-			  >) <a href="#" class="selflink"
+			  > Int) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -474,9 +400,7 @@
 		      ></span
 		      > <a href="#" title="Instances"
 		      >Foo</a
-		      > (<a href="#" title="GHC.Tuple"
-		      >(,,)</a
-		      > a a)</span
+		      > ((,,) a a)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -498,19 +422,13 @@
 			><p class="src"
 			><a href="#"
 			  >foo</a
-			  > :: (a, a, <a href="#" title="Data.Int"
-			  >Int</a
-			  >) -&gt; a0 -&gt; (a, a, a0) <a href="#" class="selflink"
+			  > :: (a, a, Int) -&gt; a0 -&gt; (a, a, a0) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
-			  > :: (a, a, (a, a, a0)) -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; (a, a, (a, a, <a href="#" title="Data.Int"
-			  >Int</a
-			  >)) <a href="#" class="selflink"
+			  > :: (a, a, (a, a, a0)) -&gt; Int -&gt; (a, a, (a, a, Int)) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -550,9 +468,7 @@
 			  >foo</a
 			  > :: <a href="#" title="Instances"
 			  >Quux</a
-			  > a b <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; a0 -&gt; <a href="#" title="Instances"
+			  > a b Int -&gt; a0 -&gt; <a href="#" title="Instances"
 			  >Quux</a
 			  > a b a0 <a href="#" class="selflink"
 			  >#</a
@@ -564,15 +480,11 @@
 			  >Quux</a
 			  > a b (<a href="#" title="Instances"
 			  >Quux</a
-			  > a b a0) -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; <a href="#" title="Instances"
+			  > a b a0) -&gt; Int -&gt; <a href="#" title="Instances"
 			  >Quux</a
 			  > a b (<a href="#" title="Instances"
 			  >Quux</a
-			  > a b <a href="#" title="Data.Int"
-			  >Int</a
-			  >) <a href="#" class="selflink"
+			  > a b Int) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -586,11 +498,7 @@
 		      ></span
 		      > <a href="#" title="Instances"
 		      >Foo</a
-		      > ((-&gt;) a :: <a href="#" title="Data.Kind"
-		      >*</a
-		      > -&gt; <a href="#" title="Data.Kind"
-		      >*</a
-		      >)</span
+		      > ((-&gt;) a :: * -&gt; *)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -612,19 +520,13 @@
 			><p class="src"
 			><a href="#"
 			  >foo</a
-			  > :: (a -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  >) -&gt; a0 -&gt; a -&gt; a0 <a href="#" class="selflink"
+			  > :: (a -&gt; Int) -&gt; a0 -&gt; a -&gt; a0 <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
-			  > :: (a -&gt; a -&gt; a0) -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; a -&gt; a -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > <a href="#" class="selflink"
+			  > :: (a -&gt; (a -&gt; a0)) -&gt; Int -&gt; a -&gt; (a -&gt; Int) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -660,9 +562,7 @@
 	    ><p class="src"
 	    ><a id="v:bar" class="def"
 	      >bar</a
-	      > :: f a -&gt; f <a href="#" title="Data.Bool"
-	      >Bool</a
-	      > -&gt; a <a href="#" class="selflink"
+	      > :: f a -&gt; f Bool -&gt; a <a href="#" class="selflink"
 	      >#</a
 	      ></p
 	    ><p class="src"
@@ -696,11 +596,7 @@
 		      ></span
 		      > <a href="#" title="Instances"
 		      >Bar</a
-		      > <a href="#" title="Data.Maybe"
-		      >Maybe</a
-		      > <a href="#" title="Data.Bool"
-		      >Bool</a
-		      ></span
+		      > Maybe Bool</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -722,71 +618,25 @@
 			><p class="src"
 			><a href="#"
 			  >bar</a
-			  > :: <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > <a href="#" title="Data.Bool"
-			  >Bool</a
-			  > -&gt; <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > <a href="#" title="Data.Bool"
-			  >Bool</a
-			  > -&gt; <a href="#" title="Data.Bool"
-			  >Bool</a
-			  > <a href="#" class="selflink"
+			  > :: Maybe Bool -&gt; Maybe Bool -&gt; Bool <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar'</a
-			  > :: <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > <a href="#" title="Data.Bool"
-			  >Bool</a
-			  >) -&gt; <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > b)) <a href="#" class="selflink"
+			  > :: Maybe (Maybe Bool) -&gt; Maybe (Maybe (Maybe b)) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar0</a
-			  > :: (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > <a href="#" title="Data.Bool"
-			  >Bool</a
-			  >, <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > <a href="#" title="Data.Bool"
-			  >Bool</a
-			  >) -&gt; (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > b, <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > c) <a href="#" class="selflink"
+			  > :: (Maybe Bool, Maybe Bool) -&gt; (Maybe b, Maybe c) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar1</a
-			  > :: (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > <a href="#" title="Data.Bool"
-			  >Bool</a
-			  >, <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > <a href="#" title="Data.Bool"
-			  >Bool</a
-			  >) -&gt; (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > b, <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > c) <a href="#" class="selflink"
+			  > :: (Maybe Bool, Maybe Bool) -&gt; (Maybe b, Maybe c) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -800,9 +650,7 @@
 		      ></span
 		      > <a href="#" title="Instances"
 		      >Bar</a
-		      > <a href="#" title="Data.Maybe"
-		      >Maybe</a
-		      > [a]</span
+		      > Maybe [a]</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -824,57 +672,25 @@
 			><p class="src"
 			><a href="#"
 			  >bar</a
-			  > :: <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > [a] -&gt; <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > <a href="#" title="Data.Bool"
-			  >Bool</a
-			  > -&gt; [a] <a href="#" class="selflink"
+			  > :: Maybe [a] -&gt; Maybe Bool -&gt; [a] <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar'</a
-			  > :: <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > [a]) -&gt; <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > b)) <a href="#" class="selflink"
+			  > :: Maybe (Maybe [a]) -&gt; Maybe (Maybe (Maybe b)) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar0</a
-			  > :: (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > [a], <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > [a]) -&gt; (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > b, <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > c) <a href="#" class="selflink"
+			  > :: (Maybe [a], Maybe [a]) -&gt; (Maybe b, Maybe c) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar1</a
-			  > :: (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > [a], <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > [a]) -&gt; (<a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > b, <a href="#" title="Data.Maybe"
-			  >Maybe</a
-			  > c) <a href="#" class="selflink"
+			  > :: (Maybe [a], Maybe [a]) -&gt; (Maybe b, Maybe c) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -910,9 +726,7 @@
 			><p class="src"
 			><a href="#"
 			  >bar</a
-			  > :: [(a, a)] -&gt; [<a href="#" title="Data.Bool"
-			  >Bool</a
-			  >] -&gt; (a, a) <a href="#" class="selflink"
+			  > :: [(a, a)] -&gt; [Bool] -&gt; (a, a) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
@@ -946,9 +760,7 @@
 		      >Foo</a
 		      > f =&gt; <a href="#" title="Instances"
 		      >Bar</a
-		      > (<a href="#" title="Data.Either"
-		      >Either</a
-		      > a) (f a)</span
+		      > (Either a) (f a)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -970,57 +782,25 @@
 			><p class="src"
 			><a href="#"
 			  >bar</a
-			  > :: <a href="#" title="Data.Either"
-			  >Either</a
-			  > a (f a) -&gt; <a href="#" title="Data.Either"
-			  >Either</a
-			  > a <a href="#" title="Data.Bool"
-			  >Bool</a
-			  > -&gt; f a <a href="#" class="selflink"
+			  > :: Either a (f a) -&gt; Either a Bool -&gt; f a <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar'</a
-			  > :: <a href="#" title="Data.Either"
-			  >Either</a
-			  > a (<a href="#" title="Data.Either"
-			  >Either</a
-			  > a (f a)) -&gt; <a href="#" title="Data.Either"
-			  >Either</a
-			  > a (<a href="#" title="Data.Either"
-			  >Either</a
-			  > a (<a href="#" title="Data.Either"
-			  >Either</a
-			  > a b)) <a href="#" class="selflink"
+			  > :: Either a (Either a (f a)) -&gt; Either a (Either a (Either a b)) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar0</a
-			  > :: (<a href="#" title="Data.Either"
-			  >Either</a
-			  > a (f a), <a href="#" title="Data.Either"
-			  >Either</a
-			  > a (f a)) -&gt; (<a href="#" title="Data.Either"
-			  >Either</a
-			  > a b, <a href="#" title="Data.Either"
-			  >Either</a
-			  > a c) <a href="#" class="selflink"
+			  > :: (Either a (f a), Either a (f a)) -&gt; (Either a b, Either a c) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar1</a
-			  > :: (<a href="#" title="Data.Either"
-			  >Either</a
-			  > a (f a), <a href="#" title="Data.Either"
-			  >Either</a
-			  > a (f a)) -&gt; (<a href="#" title="Data.Either"
-			  >Either</a
-			  > a b, <a href="#" title="Data.Either"
-			  >Either</a
-			  > a c) <a href="#" class="selflink"
+			  > :: (Either a (f a), Either a (f a)) -&gt; (Either a b, Either a c) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -1034,13 +814,9 @@
 		      ></span
 		      > <a href="#" title="Instances"
 		      >Foo</a
-		      > (<a href="#" title="GHC.Tuple"
-		      >(,,)</a
-		      > a b) =&gt; <a href="#" title="Instances"
+		      > ((,,) a b) =&gt; <a href="#" title="Instances"
 		      >Bar</a
-		      > (<a href="#" title="GHC.Tuple"
-		      >(,,)</a
-		      > a b) (a, b, a)</span
+		      > ((,,) a b) (a, b, a)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -1062,9 +838,7 @@
 			><p class="src"
 			><a href="#"
 			  >bar</a
-			  > :: (a, b, (a, b, a)) -&gt; (a, b, <a href="#" title="Data.Bool"
-			  >Bool</a
-			  >) -&gt; (a, b, a) <a href="#" class="selflink"
+			  > :: (a, b, (a, b, a)) -&gt; (a, b, Bool) -&gt; (a, b, a) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
@@ -1128,9 +902,7 @@
 			  >Quux</a
 			  > a b c) -&gt; <a href="#" title="Instances"
 			  >Quux</a
-			  > a c <a href="#" title="Data.Bool"
-			  >Bool</a
-			  > -&gt; <a href="#" title="Instances"
+			  > a c Bool -&gt; <a href="#" title="Instances"
 			  >Quux</a
 			  > a b c <a href="#" class="selflink"
 			  >#</a
@@ -1660,9 +1432,7 @@
 			  >foo</a
 			  > :: <a href="#" title="Instances"
 			  >Quux</a
-			  > a b <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; a0 -&gt; <a href="#" title="Instances"
+			  > a b Int -&gt; a0 -&gt; <a href="#" title="Instances"
 			  >Quux</a
 			  > a b a0 <a href="#" class="selflink"
 			  >#</a
@@ -1674,15 +1444,11 @@
 			  >Quux</a
 			  > a b (<a href="#" title="Instances"
 			  >Quux</a
-			  > a b a0) -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; <a href="#" title="Instances"
+			  > a b a0) -&gt; Int -&gt; <a href="#" title="Instances"
 			  >Quux</a
 			  > a b (<a href="#" title="Instances"
 			  >Quux</a
-			  > a b <a href="#" title="Data.Int"
-			  >Int</a
-			  >) <a href="#" class="selflink"
+			  > a b Int) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -1728,9 +1494,7 @@
 			  >Quux</a
 			  > a b c) -&gt; <a href="#" title="Instances"
 			  >Quux</a
-			  > a c <a href="#" title="Data.Bool"
-			  >Bool</a
-			  > -&gt; <a href="#" title="Instances"
+			  > a c Bool -&gt; <a href="#" title="Instances"
 			  >Quux</a
 			  > a b c <a href="#" class="selflink"
 			  >#</a
@@ -1878,9 +1642,7 @@
 		      >data</span
 		      > <a href="#" title="Instances"
 		      >Thud</a
-		      > <a href="#" title="Data.Int"
-		      >Int</a
-		      > (<a href="#" title="Instances"
+		      > Int (<a href="#" title="Instances"
 		      >Quux</a
 		      > a [a] c)</span
 		    > <a href="#" class="selflink"
@@ -1903,9 +1665,7 @@
 			>data</span
 			> <a href="#" title="Instances"
 			>Thud</a
-			> <a href="#" title="Data.Int"
-			>Int</a
-			> (<a href="#" title="Instances"
+			> Int (<a href="#" title="Instances"
 			>Quux</a
 			> a [a] c) <ul class="inst"
 			><li class="inst"
@@ -1915,11 +1675,7 @@
 			  ><li class="inst"
 			  >| <a id="v:Thuuud" class="def"
 			    >Thuuud</a
-			    > <a href="#" title="Data.Int"
-			    >Int</a
-			    > <a href="#" title="Data.Int"
-			    >Int</a
-			    ></li
+			    > Int Int</li
 			  ></ul
 			></div
 		      ></details
@@ -1990,11 +1746,7 @@
 		      ></span
 		      > <a href="#" title="Instances"
 		      >Norf</a
-		      > <a href="#" title="Data.Int"
-		      >Int</a
-		      > <a href="#" title="Data.Bool"
-		      >Bool</a
-		      ></span
+		      > Int Bool</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -2018,13 +1770,7 @@
 			  >type</span
 			  > <a href="#" title="Instances"
 			  >Plugh</a
-			  > <a href="#" title="Data.Int"
-			  >Int</a
-			  > c <a href="#" title="Data.Bool"
-			  >Bool</a
-			  > :: <a href="#" title="Data.Kind"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > Int c Bool :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
@@ -2032,11 +1778,7 @@
 			  >data</span
 			  > <a href="#" title="Instances"
 			  >Thud</a
-			  > <a href="#" title="Data.Int"
-			  >Int</a
-			  > c :: <a href="#" title="Data.Kind"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > Int c :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -2048,17 +1790,7 @@
 			  >norf</a
 			  > :: <a href="#" title="Instances"
 			  >Plugh</a
-			  > <a href="#" title="Data.Int"
-			  >Int</a
-			  > c <a href="#" title="Data.Bool"
-			  >Bool</a
-			  > -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; (<a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; c) -&gt; <a href="#" title="Data.Bool"
-			  >Bool</a
-			  > <a href="#" class="selflink"
+			  > Int c Bool -&gt; Int -&gt; (Int -&gt; c) -&gt; Bool <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -2096,9 +1828,7 @@
 			  >type</span
 			  > <a href="#" title="Instances"
 			  >Plugh</a
-			  > [a] c [b] :: <a href="#" title="Data.Kind"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > [a] c [b] :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
@@ -2106,9 +1836,7 @@
 			  >data</span
 			  > <a href="#" title="Instances"
 			  >Thud</a
-			  > [a] c :: <a href="#" title="Data.Kind"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > [a] c :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
diff --git a/html-test/ref/Math.html b/html-test/ref/Math.html
index 71079bdd..ebdf6385 100644
--- a/html-test/ref/Math.html
+++ b/html-test/ref/Math.html
@@ -62,9 +62,7 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >f</a
-	      > :: <a href="#" title="Prelude"
-	      >Integer</a
-	      ></li
+	      > :: Integer</li
 	    ></ul
 	  ></details
 	></div
@@ -75,9 +73,7 @@
 	><p class="src"
 	  ><a id="v:f" class="def"
 	    >f</a
-	    > :: <a href="#" title="Prelude"
-	    >Integer</a
-	    > <a href="#" class="selflink"
+	    > :: Integer <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/ModuleWithWarning.html b/html-test/ref/ModuleWithWarning.html
index 7a045575..c29b20d9 100644
--- a/html-test/ref/ModuleWithWarning.html
+++ b/html-test/ref/ModuleWithWarning.html
@@ -61,9 +61,7 @@
 	><p class="src"
 	  ><a id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
diff --git a/html-test/ref/NoLayout.html b/html-test/ref/NoLayout.html
index a92d1a34..1f908ba3 100644
--- a/html-test/ref/NoLayout.html
+++ b/html-test/ref/NoLayout.html
@@ -46,9 +46,7 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >g</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ></ul
 	  ></details
 	></div
@@ -59,9 +57,7 @@
 	><p class="src"
 	  ><a id="v:g" class="def"
 	    >g</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index 26b7e7f0..d01038a3 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -136,9 +136,7 @@
 		  >type</span
 		  > a <a href="#"
 		  >&lt;&gt;&lt;</a
-		  > b :: <a href="#" title="Data.Kind"
-		  >*</a
-		  ></li
+		  > b :: *</li
 		><li
 		><span class="keyword"
 		  >data</span
@@ -400,9 +398,7 @@
 	      >type</span
 	      > a <a id="t:-60--62--60-" class="def"
 	      >&lt;&gt;&lt;</a
-	      > b :: <a href="#" title="Data.Kind"
-	      >*</a
-	      > <span class="fixity"
+	      > b :: * <span class="fixity"
 	      >infixl 2</span
 	      ><span class="rightedge"
 	      ></span
diff --git a/html-test/ref/OrphanInstances.html b/html-test/ref/OrphanInstances.html
index 16ac16d6..a70c9640 100644
--- a/html-test/ref/OrphanInstances.html
+++ b/html-test/ref/OrphanInstances.html
@@ -86,9 +86,7 @@
 		      >aClass</a
 		      > :: <a href="#" title="OrphanInstancesType"
 		      >AType</a
-		      > -&gt; <a href="#" title="Data.Int"
-		      >Int</a
-		      > <a href="#" class="selflink"
+		      > -&gt; Int <a href="#" class="selflink"
 		      >#</a
 		      ></p
 		    ></div
diff --git a/html-test/ref/OrphanInstancesClass.html b/html-test/ref/OrphanInstancesClass.html
index 81651e18..c59c43dd 100644
--- a/html-test/ref/OrphanInstancesClass.html
+++ b/html-test/ref/OrphanInstancesClass.html
@@ -58,9 +58,7 @@
 	    ><p class="src"
 	    ><a id="v:aClass" class="def"
 	      >aClass</a
-	      > :: a -&gt; <a href="#" title="Data.Int"
-	      >Int</a
-	      > <a href="#" class="selflink"
+	      > :: a -&gt; Int <a href="#" class="selflink"
 	      >#</a
 	      ></p
 	    ></div
@@ -104,9 +102,7 @@
 			  >aClass</a
 			  > :: <a href="#" title="OrphanInstancesType"
 			  >AType</a
-			  > -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > <a href="#" class="selflink"
+			  > -&gt; Int <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
diff --git a/html-test/ref/OrphanInstancesType.html b/html-test/ref/OrphanInstancesType.html
index ddb85534..2714bb1f 100644
--- a/html-test/ref/OrphanInstancesType.html
+++ b/html-test/ref/OrphanInstancesType.html
@@ -58,9 +58,7 @@
 	      ><td class="src"
 		><a id="v:AType" class="def"
 		  >AType</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  ></td
+		  > Int</td
 		><td class="doc empty"
 		></td
 		></tr
@@ -106,9 +104,7 @@
 			  >aClass</a
 			  > :: <a href="#" title="OrphanInstancesType"
 			  >AType</a
-			  > -&gt; <a href="#" title="Data.Int"
-			  >Int</a
-			  > <a href="#" class="selflink"
+			  > -&gt; Int <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
diff --git a/html-test/ref/PatternSyns.html b/html-test/ref/PatternSyns.html
index ff6144cf..fce20f96 100644
--- a/html-test/ref/PatternSyns.html
+++ b/html-test/ref/PatternSyns.html
@@ -100,9 +100,7 @@
 	      >data</span
 	      > <a href="#"
 	      >BlubType</a
-	      > = <a href="#" title="Text.Show"
-	      >Show</a
-	      > x =&gt; <a href="#"
+	      > = Show x =&gt; <a href="#"
 	      >BlubCtor</a
 	      > x</li
 	    ><li class="src short"
@@ -112,17 +110,13 @@
 	      >Blub</a
 	      > :: () =&gt; <span class="keyword"
 	      >forall</span
-	      > x. <a href="#" title="Text.Show"
-	      >Show</a
-	      > x =&gt; x -&gt; <a href="#" title="PatternSyns"
+	      > x. Show x =&gt; x -&gt; <a href="#" title="PatternSyns"
 	      >BlubType</a
 	      ></li
 	    ><li class="src short"
 	    ><span class="keyword"
 	      >data</span
-	      > (a :: <a href="#" title="Data.Kind"
-	      >*</a
-	      >) <a href="#"
+	      > (a :: *) <a href="#"
 	      >&gt;&lt;</a
 	      > b = <a href="#"
 	      >Empty</a
@@ -142,9 +136,7 @@
 	      >pattern</span
 	      > <a href="#"
 	      >PatWithExplicitSig</a
-	      > :: <a href="#" title="Data.Eq"
-	      >Eq</a
-	      > somex =&gt; somex -&gt; <a href="#" title="PatternSyns"
+	      > :: Eq somex =&gt; somex -&gt; <a href="#" title="PatternSyns"
 	      >FooType</a
 	      > somex</li
 	    ></ul
@@ -272,9 +264,7 @@
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" title="Text.Show"
-		  >Show</a
-		  > x =&gt; <a id="v:BlubCtor" class="def"
+		>Show x =&gt; <a id="v:BlubCtor" class="def"
 		  >BlubCtor</a
 		  > x</td
 		><td class="doc empty"
@@ -291,9 +281,7 @@
 	    >Blub</a
 	    > :: () =&gt; <span class="keyword"
 	    >forall</span
-	    > x. <a href="#" title="Text.Show"
-	    >Show</a
-	    > x =&gt; x -&gt; <a href="#" title="PatternSyns"
+	    > x. Show x =&gt; x -&gt; <a href="#" title="PatternSyns"
 	    >BlubType</a
 	    > <a href="#" class="selflink"
 	    >#</a
@@ -311,9 +299,7 @@
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > (a :: <a href="#" title="Data.Kind"
-	    >*</a
-	    >) <a id="t:-62--60-" class="def"
+	    > (a :: *) <a id="t:-62--60-" class="def"
 	    >&gt;&lt;</a
 	    > b <a href="#" class="selflink"
 	    >#</a
@@ -369,9 +355,7 @@
 	    >pattern</span
 	    > <a id="v:PatWithExplicitSig" class="def"
 	    >PatWithExplicitSig</a
-	    > :: <a href="#" title="Data.Eq"
-	    >Eq</a
-	    > somex =&gt; somex -&gt; <a href="#" title="PatternSyns"
+	    > :: Eq somex =&gt; somex -&gt; <a href="#" title="PatternSyns"
 	    >FooType</a
 	    > somex <a href="#" class="selflink"
 	    >#</a
diff --git a/html-test/ref/PromotedTypes.html b/html-test/ref/PromotedTypes.html
index 0ec1adcc..46a70845 100644
--- a/html-test/ref/PromotedTypes.html
+++ b/html-test/ref/PromotedTypes.html
@@ -81,11 +81,7 @@
 	    >data</span
 	    > <a id="t:Pattern" class="def"
 	    >Pattern</a
-	    > :: [<a href="#" title="Data.Kind"
-	    >*</a
-	    >] -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > <span class="keyword"
+	    > :: [*] -&gt; * <span class="keyword"
 	    >where</span
 	    > <a href="#" class="selflink"
 	    >#</a
@@ -108,9 +104,7 @@
 	      ><td class="src"
 		><a id="v:Cons" class="def"
 		  >Cons</a
-		  > :: <a href="#" title="Data.Maybe"
-		  >Maybe</a
-		  > h -&gt; <a href="#" title="PromotedTypes"
+		  > :: Maybe h -&gt; <a href="#" title="PromotedTypes"
 		  >Pattern</a
 		  > t -&gt; <a href="#" title="PromotedTypes"
 		  >Pattern</a
@@ -129,11 +123,7 @@
 	    >RevPattern</a
 	    > :: <a href="#" title="PromotedTypes"
 	    >RevList</a
-	    > <a href="#" title="Data.Kind"
-	    >*</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > <span class="keyword"
+	    > * -&gt; * <span class="keyword"
 	    >where</span
 	    > <a href="#" class="selflink"
 	    >#</a
@@ -158,9 +148,7 @@
 	      ><td class="src"
 		><a id="v:RevCons" class="def"
 		  >RevCons</a
-		  > :: <a href="#" title="Data.Maybe"
-		  >Maybe</a
-		  > h -&gt; <a href="#" title="PromotedTypes"
+		  > :: Maybe h -&gt; <a href="#" title="PromotedTypes"
 		  >RevPattern</a
 		  > t -&gt; <a href="#" title="PromotedTypes"
 		  >RevPattern</a
@@ -179,13 +167,7 @@
 	    >data</span
 	    > <a id="t:Tuple" class="def"
 	    >Tuple</a
-	    > :: (<a href="#" title="Data.Kind"
-	    >*</a
-	    >, <a href="#" title="Data.Kind"
-	    >*</a
-	    >) -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    > <span class="keyword"
+	    > :: (*, *) -&gt; * <span class="keyword"
 	    >where</span
 	    > <a href="#" class="selflink"
 	    >#</a
diff --git a/html-test/ref/Properties.html b/html-test/ref/Properties.html
index daabe6c4..9299486c 100644
--- a/html-test/ref/Properties.html
+++ b/html-test/ref/Properties.html
@@ -46,11 +46,7 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >fib</a
-	      > :: <a href="#" title="Prelude"
-	      >Integer</a
-	      > -&gt; <a href="#" title="Prelude"
-	      >Integer</a
-	      ></li
+	      > :: Integer -&gt; Integer</li
 	    ></ul
 	  ></details
 	></div
@@ -61,19 +57,13 @@
 	><p class="src"
 	  ><a id="v:fib" class="def"
 	    >fib</a
-	    > :: <a href="#" title="Prelude"
-	    >Integer</a
-	    > -&gt; <a href="#" title="Prelude"
-	    >Integer</a
-	    > <a href="#" class="selflink"
+	    > :: Integer -&gt; Integer <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Fibonacci number of given <code
-	      ><a href="#" title="Prelude"
-		>Integer</a
-		></code
+	      >Integer</code
 	      >.</p
 	    ><pre
 	    >fib n &lt;= fib (n + 1)</pre
diff --git a/html-test/ref/QuasiExpr.html b/html-test/ref/QuasiExpr.html
index dfded323..42b21f70 100644
--- a/html-test/ref/QuasiExpr.html
+++ b/html-test/ref/QuasiExpr.html
@@ -58,9 +58,7 @@
 	      ><td class="src"
 		><a id="v:IntExpr" class="def"
 		  >IntExpr</a
-		  > <a href="#" title="Prelude"
-		  >Integer</a
-		  ></td
+		  > Integer</td
 		><td class="doc empty"
 		></td
 		></tr
@@ -68,9 +66,7 @@
 	      ><td class="src"
 		><a id="v:AntiIntExpr" class="def"
 		  >AntiIntExpr</a
-		  > <a href="#" title="Data.String"
-		  >String</a
-		  ></td
+		  > String</td
 		><td class="doc empty"
 		></td
 		></tr
@@ -92,9 +88,7 @@
 	      ><td class="src"
 		><a id="v:AntiExpr" class="def"
 		  >AntiExpr</a
-		  > <a href="#" title="Data.String"
-		  >String</a
-		  ></td
+		  > String</td
 		><td class="doc empty"
 		></td
 		></tr
@@ -110,9 +104,7 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:id:Expr:Show:1"
 		      ></span
-		      > <a href="#" title="Text.Show"
-		      >Show</a
-		      > <a href="#" title="QuasiExpr"
+		      > Show <a href="#" title="QuasiExpr"
 		      >Expr</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -136,35 +128,21 @@
 			><p class="src"
 			><a href="#"
 			  >showsPrec</a
-			  > :: <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; <a href="#" title="QuasiExpr"
+			  > :: Int -&gt; <a href="#" title="QuasiExpr"
 			  >Expr</a
-			  > -&gt; <a href="#" title="Text.Show"
-			  >ShowS</a
-			  > <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > -&gt; ShowS</p
 			><p class="src"
 			><a href="#"
 			  >show</a
 			  > :: <a href="#" title="QuasiExpr"
 			  >Expr</a
-			  > -&gt; <a href="#" title="Data.String"
-			  >String</a
-			  > <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > -&gt; String</p
 			><p class="src"
 			><a href="#"
 			  >showList</a
 			  > :: [<a href="#" title="QuasiExpr"
 			  >Expr</a
-			  >] -&gt; <a href="#" title="Text.Show"
-			  >ShowS</a
-			  > <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  >] -&gt; ShowS</p
 			></div
 		      ></details
 		    ></td
@@ -230,9 +208,7 @@
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:id:BinOp:Show:1"
 		      ></span
-		      > <a href="#" title="Text.Show"
-		      >Show</a
-		      > <a href="#" title="QuasiExpr"
+		      > Show <a href="#" title="QuasiExpr"
 		      >BinOp</a
 		      ></span
 		    > <a href="#" class="selflink"
@@ -256,35 +232,21 @@
 			><p class="src"
 			><a href="#"
 			  >showsPrec</a
-			  > :: <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; <a href="#" title="QuasiExpr"
+			  > :: Int -&gt; <a href="#" title="QuasiExpr"
 			  >BinOp</a
-			  > -&gt; <a href="#" title="Text.Show"
-			  >ShowS</a
-			  > <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > -&gt; ShowS</p
 			><p class="src"
 			><a href="#"
 			  >show</a
 			  > :: <a href="#" title="QuasiExpr"
 			  >BinOp</a
-			  > -&gt; <a href="#" title="Data.String"
-			  >String</a
-			  > <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > -&gt; String</p
 			><p class="src"
 			><a href="#"
 			  >showList</a
 			  > :: [<a href="#" title="QuasiExpr"
 			  >BinOp</a
-			  >] -&gt; <a href="#" title="Text.Show"
-			  >ShowS</a
-			  > <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  >] -&gt; ShowS</p
 			></div
 		      ></details
 		    ></td
@@ -299,9 +261,7 @@
 	    >eval</a
 	    > :: <a href="#" title="QuasiExpr"
 	    >Expr</a
-	    > -&gt; <a href="#" title="Prelude"
-	    >Integer</a
-	    > <a href="#" class="selflink"
+	    > -&gt; Integer <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -309,9 +269,7 @@
 	><p class="src"
 	  ><a id="v:expr" class="def"
 	    >expr</a
-	    > :: <a href="#" title="Language.Haskell.TH.Quote"
-	    >QuasiQuoter</a
-	    > <a href="#" class="selflink"
+	    > :: QuasiQuoter <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -319,13 +277,7 @@
 	><p class="src"
 	  ><a id="v:parseExprExp" class="def"
 	    >parseExprExp</a
-	    > :: <a href="#" title="Data.String"
-	    >String</a
-	    > -&gt; <a href="#" title="Language.Haskell.TH.Syntax"
-	    >Q</a
-	    > <a href="#" title="Language.Haskell.TH.Syntax"
-	    >Exp</a
-	    > <a href="#" class="selflink"
+	    > :: String -&gt; Q Exp <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
diff --git a/html-test/ref/QuasiQuote.html b/html-test/ref/QuasiQuote.html
index c73250b8..e9451d8a 100644
--- a/html-test/ref/QuasiQuote.html
+++ b/html-test/ref/QuasiQuote.html
@@ -45,9 +45,7 @@
 	><p class="src"
 	  ><a id="v:val" class="def"
 	    >val</a
-	    > :: <a href="#" title="Prelude"
-	    >Integer</a
-	    > <a href="#" class="selflink"
+	    > :: Integer <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index cd80ed34..00cea04a 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -73,11 +73,7 @@ Fix spurious superclass constraints bug.</pre
 	    >data</span
 	    > <a id="t:SomeType" class="def"
 	    >SomeType</a
-	    > (f :: <a href="#" title="Data.Kind"
-	    >*</a
-	    > -&gt; <a href="#" title="Data.Kind"
-	    >*</a
-	    >) a <a href="#" class="selflink"
+	    > (f :: * -&gt; *) a <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="subs instances"
@@ -90,9 +86,7 @@ Fix spurious superclass constraints bug.</pre
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:id:SomeType:Functor:1"
 		      ></span
-		      > <a href="#" title="Data.Functor"
-		      >Functor</a
-		      > (<a href="#" title="SpuriousSuperclassConstraints"
+		      > Functor (<a href="#" title="SpuriousSuperclassConstraints"
 		      >SomeType</a
 		      > f)</span
 		    > <a href="#" class="selflink"
@@ -120,9 +114,7 @@ Fix spurious superclass constraints bug.</pre
 			  >SomeType</a
 			  > f a -&gt; <a href="#" title="SpuriousSuperclassConstraints"
 			  >SomeType</a
-			  > f b <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > f b</p
 			><p class="src"
 			><a href="#"
 			  >(&lt;$)</a
@@ -130,9 +122,7 @@ Fix spurious superclass constraints bug.</pre
 			  >SomeType</a
 			  > f b -&gt; <a href="#" title="SpuriousSuperclassConstraints"
 			  >SomeType</a
-			  > f a <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > f a</p
 			></div
 		      ></details
 		    ></td
@@ -142,11 +132,7 @@ Fix spurious superclass constraints bug.</pre
 		  ><span class="inst-left"
 		    ><span class="instance details-toggle-control details-toggle" data-details-id="i:id:SomeType:Applicative:2"
 		      ></span
-		      > <a href="#" title="Control.Applicative"
-		      >Applicative</a
-		      > f =&gt; <a href="#" title="Control.Applicative"
-		      >Applicative</a
-		      > (<a href="#" title="SpuriousSuperclassConstraints"
+		      > Applicative f =&gt; Applicative (<a href="#" title="SpuriousSuperclassConstraints"
 		      >SomeType</a
 		      > f)</span
 		    > <a href="#" class="selflink"
@@ -172,9 +158,7 @@ Fix spurious superclass constraints bug.</pre
 			  >pure</a
 			  > :: a -&gt; <a href="#" title="SpuriousSuperclassConstraints"
 			  >SomeType</a
-			  > f a <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > f a</p
 			><p class="src"
 			><a href="#"
 			  >(&lt;*&gt;)</a
@@ -184,9 +168,7 @@ Fix spurious superclass constraints bug.</pre
 			  >SomeType</a
 			  > f a -&gt; <a href="#" title="SpuriousSuperclassConstraints"
 			  >SomeType</a
-			  > f b <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > f b</p
 			><p class="src"
 			><a href="#"
 			  >liftA2</a
@@ -196,9 +178,7 @@ Fix spurious superclass constraints bug.</pre
 			  >SomeType</a
 			  > f b -&gt; <a href="#" title="SpuriousSuperclassConstraints"
 			  >SomeType</a
-			  > f c <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > f c</p
 			><p class="src"
 			><a href="#"
 			  >(*&gt;)</a
@@ -208,9 +188,7 @@ Fix spurious superclass constraints bug.</pre
 			  >SomeType</a
 			  > f b -&gt; <a href="#" title="SpuriousSuperclassConstraints"
 			  >SomeType</a
-			  > f b <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > f b</p
 			><p class="src"
 			><a href="#"
 			  >(&lt;*)</a
@@ -220,9 +198,7 @@ Fix spurious superclass constraints bug.</pre
 			  >SomeType</a
 			  > f b -&gt; <a href="#" title="SpuriousSuperclassConstraints"
 			  >SomeType</a
-			  > f a <a href="#" class="selflink"
-			  >#</a
-			  ></p
+			  > f a</p
 			></div
 		      ></details
 		    ></td
diff --git a/html-test/ref/TH.html b/html-test/ref/TH.html
index a35204ff..403abe62 100644
--- a/html-test/ref/TH.html
+++ b/html-test/ref/TH.html
@@ -45,11 +45,7 @@
 	><p class="src"
 	  ><a id="v:decl" class="def"
 	    >decl</a
-	    > :: <a href="#" title="Language.Haskell.TH.Syntax"
-	    >Q</a
-	    > [<a href="#" title="Language.Haskell.TH.Syntax"
-	    >Dec</a
-	    >] <a href="#" class="selflink"
+	    > :: Q [Dec] <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index 26481afe..d4c2417c 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -165,13 +165,7 @@
 	      ><li
 		>= <a href="#"
 		  >A</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  > (<a href="#" title="Data.Maybe"
-		  >Maybe</a
-		  > <a href="#" title="Prelude"
-		  >Float</a
-		  >)</li
+		  > Int (Maybe Float)</li
 		><li
 		>| <a href="#"
 		  >B</a
@@ -179,11 +173,7 @@
 		  >T</a
 		  > a b, <a href="#" title="Test"
 		  >T</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  > <a href="#" title="Prelude"
-		  >Float</a
-		  >)</li
+		  > Int Float)</li
 		></ul
 	      ></li
 	    ><li class="src short"
@@ -357,9 +347,7 @@
 		  ><li
 		    ><a href="#"
 		      >p</a
-		      > :: <a href="#" title="Data.Int"
-		      >Int</a
-		      ></li
+		      > :: Int</li
 		    ><li
 		    ><a href="#"
 		      >q</a
@@ -371,9 +359,7 @@
 		      >r</a
 		      >, <a href="#"
 		      >s</a
-		      > :: <a href="#" title="Data.Int"
-		      >Int</a
-		      ></li
+		      > :: Int</li
 		    ></ul
 		  > }</li
 		><li
@@ -385,23 +371,11 @@
 		      >t</a
 		      > :: T1 -&gt; <a href="#" title="Test"
 		      >T2</a
-		      > <a href="#" title="Data.Int"
-		      >Int</a
-		      > <a href="#" title="Data.Int"
-		      >Int</a
-		      > -&gt; <a href="#" title="Test"
+		      > Int Int -&gt; <a href="#" title="Test"
 		      >T3</a
-		      > <a href="#" title="Data.Bool"
-		      >Bool</a
-		      > <a href="#" title="Data.Bool"
-		      >Bool</a
-		      > -&gt; <a href="#" title="Test"
+		      > Bool Bool -&gt; <a href="#" title="Test"
 		      >T4</a
-		      > <a href="#" title="Prelude"
-		      >Float</a
-		      > <a href="#" title="Prelude"
-		      >Float</a
-		      > -&gt; <a href="#" title="Test"
+		      > Float Float -&gt; <a href="#" title="Test"
 		      >T5</a
 		      > () ()</li
 		    ><li
@@ -409,9 +383,7 @@
 		      >u</a
 		      >, <a href="#"
 		      >v</a
-		      > :: <a href="#" title="Data.Int"
-		      >Int</a
-		      ></li
+		      > :: Int</li
 		    ></ul
 		  > }</li
 		></ul
@@ -427,21 +399,15 @@
 	      ><li
 		><a href="#"
 		  >s1</a
-		  > :: <a href="#" title="Data.Int"
-		  >Int</a
-		  ></li
+		  > :: Int</li
 		><li
 		><a href="#"
 		  >s2</a
-		  > :: <a href="#" title="Data.Int"
-		  >Int</a
-		  ></li
+		  > :: Int</li
 		><li
 		><a href="#"
 		  >s3</a
-		  > :: <a href="#" title="Data.Int"
-		  >Int</a
-		  ></li
+		  > :: Int</li
 		></ul
 	      >}</li
 	    ><li class="src short"
@@ -449,9 +415,7 @@
 	      >p</a
 	      > :: <a href="#" title="Test"
 	      >R</a
-	      > -&gt; <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > -&gt; Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >q</a
@@ -465,9 +429,7 @@
 	      >u</a
 	      > :: <a href="#" title="Test"
 	      >R</a
-	      > -&gt; <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > -&gt; Int</li
 	    ><li class="src short"
 	    ><span class="keyword"
 	      >class</span
@@ -481,9 +443,7 @@
 	      ><li
 		><a href="#"
 		  >a</a
-		  > :: <a href="#" title="System.IO"
-		  >IO</a
-		  > a</li
+		  > :: IO a</li
 		><li
 		><a href="#"
 		  >b</a
@@ -535,33 +495,21 @@
 	      >a</a
 	      > :: <a href="#" title="Test"
 	      >C</a
-	      > a =&gt; <a href="#" title="System.IO"
-	      >IO</a
-	      > a</li
+	      > a =&gt; IO a</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >f</a
 	      > :: <a href="#" title="Test"
 	      >C</a
-	      > a =&gt; a -&gt; <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > a =&gt; a -&gt; Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >g</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      > -&gt; <a href="#" title="System.IO"
-	      >IO</a
-	      > CInt</li
+	      > :: Int -&gt; IO CInt</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >hidden</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      > -&gt; <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int -&gt; Int</li
 	    ><li class="src short"
 	    >module <a href="#"
 	      >Visible</a
@@ -603,39 +551,17 @@
 	      >T</a
 	      > () () -&gt; <a href="#" title="Test"
 	      >T2</a
-	      > <a href="#" title="Data.Int"
-	      >Int</a
-	      > <a href="#" title="Data.Int"
-	      >Int</a
-	      > -&gt; (<a href="#" title="Test"
+	      > Int Int -&gt; (<a href="#" title="Test"
 	      >T3</a
-	      > <a href="#" title="Data.Bool"
-	      >Bool</a
-	      > <a href="#" title="Data.Bool"
-	      >Bool</a
-	      > -&gt; <a href="#" title="Test"
+	      > Bool Bool -&gt; <a href="#" title="Test"
 	      >T4</a
-	      > <a href="#" title="Prelude"
-	      >Float</a
-	      > <a href="#" title="Prelude"
-	      >Float</a
-	      >) -&gt; <a href="#" title="Test"
+	      > Float Float) -&gt; <a href="#" title="Test"
 	      >T5</a
-	      > () () -&gt; <a href="#" title="System.IO"
-	      >IO</a
-	      > ()</li
+	      > () () -&gt; IO ()</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >l</a
-	      > :: (<a href="#" title="Data.Int"
-	      >Int</a
-	      >, <a href="#" title="Data.Int"
-	      >Int</a
-	      >, <a href="#" title="Prelude"
-	      >Float</a
-	      >) -&gt; <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: (Int, Int, Float) -&gt; Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >m</a
@@ -643,33 +569,19 @@
 	      >R</a
 	      > -&gt; <a href="#" title="Test"
 	      >N1</a
-	      > () -&gt; <a href="#" title="System.IO"
-	      >IO</a
-	      > <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > () -&gt; IO Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >o</a
-	      > :: <a href="#" title="Prelude"
-	      >Float</a
-	      > -&gt; <a href="#" title="System.IO"
-	      >IO</a
-	      > <a href="#" title="Prelude"
-	      >Float</a
-	      ></li
+	      > :: Float -&gt; IO Float</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >f'</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >withType</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >withoutType</a
@@ -710,13 +622,7 @@
 	      ><td class="src"
 		><a id="v:A" class="def"
 		  >A</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  > (<a href="#" title="Data.Maybe"
-		  >Maybe</a
-		  > <a href="#" title="Prelude"
-		  >Float</a
-		  >)</td
+		  > Int (Maybe Float)</td
 		><td class="doc"
 		><p
 		  >This comment describes the <code
@@ -734,11 +640,7 @@
 		  >T</a
 		  > a b, <a href="#" title="Test"
 		  >T</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  > <a href="#" title="Prelude"
-		  >Float</a
-		  >)</td
+		  > Int Float)</td
 		><td class="doc"
 		><p
 		  >This comment describes the <code
@@ -1286,9 +1188,7 @@
 		      ><dfn class="src"
 			><a id="v:p" class="def"
 			  >p</a
-			  > :: <a href="#" title="Data.Int"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc"
 			><p
 			  >This comment applies to the <code
@@ -1320,9 +1220,7 @@
 			  >r</a
 			  >, <a id="v:s" class="def"
 			  >s</a
-			  > :: <a href="#" title="Data.Int"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc"
 			><p
 			  >This comment applies to both <code
@@ -1366,23 +1264,11 @@
 			  >t</a
 			  > :: T1 -&gt; <a href="#" title="Test"
 			  >T2</a
-			  > <a href="#" title="Data.Int"
-			  >Int</a
-			  > <a href="#" title="Data.Int"
-			  >Int</a
-			  > -&gt; <a href="#" title="Test"
+			  > Int Int -&gt; <a href="#" title="Test"
 			  >T3</a
-			  > <a href="#" title="Data.Bool"
-			  >Bool</a
-			  > <a href="#" title="Data.Bool"
-			  >Bool</a
-			  > -&gt; <a href="#" title="Test"
+			  > Bool Bool -&gt; <a href="#" title="Test"
 			  >T4</a
-			  > <a href="#" title="Prelude"
-			  >Float</a
-			  > <a href="#" title="Prelude"
-			  >Float</a
-			  > -&gt; <a href="#" title="Test"
+			  > Float Float -&gt; <a href="#" title="Test"
 			  >T5</a
 			  > () ()</dfn
 			><div class="doc empty"
@@ -1394,9 +1280,7 @@
 			  >u</a
 			  >, <a id="v:v" class="def"
 			  >v</a
-			  > :: <a href="#" title="Data.Int"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc empty"
 			></div
 			></li
@@ -1448,9 +1332,7 @@
 		      ><dfn class="src"
 			><a id="v:s1" class="def"
 			  >s1</a
-			  > :: <a href="#" title="Data.Int"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc"
 			><p
 			  >The <code
@@ -1464,9 +1346,7 @@
 		      ><dfn class="src"
 			><a id="v:s2" class="def"
 			  >s2</a
-			  > :: <a href="#" title="Data.Int"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc"
 			><p
 			  >The <code
@@ -1480,9 +1360,7 @@
 		      ><dfn class="src"
 			><a id="v:s3" class="def"
 			  >s3</a
-			  > :: <a href="#" title="Data.Int"
-			  >Int</a
-			  ></dfn
+			  > :: Int</dfn
 			><div class="doc"
 			><p
 			  >The <code
@@ -1509,9 +1387,7 @@
 	    >p</a
 	    > :: <a href="#" title="Test"
 	    >R</a
-	    > -&gt; <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > -&gt; Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -1549,9 +1425,7 @@
 	    >u</a
 	    > :: <a href="#" title="Test"
 	    >R</a
-	    > -&gt; <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > -&gt; Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -1588,9 +1462,7 @@
 	    ><p class="src"
 	    ><a id="v:a" class="def"
 	      >a</a
-	      > :: <a href="#" title="System.IO"
-	      >IO</a
-	      > a <a href="#" class="selflink"
+	      > :: IO a <a href="#" class="selflink"
 	      >#</a
 	      ></p
 	    ><div class="doc"
@@ -1662,9 +1534,7 @@
 		      ></span
 		      > <a href="#" title="Test"
 		      >D</a
-		      > <a href="#" title="Prelude"
-		      >Float</a
-		      ></span
+		      > Float</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -1688,19 +1558,13 @@
 			  >d</a
 			  > :: <a href="#" title="Test"
 			  >T</a
-			  > <a href="#" title="Prelude"
-			  >Float</a
-			  > b <a href="#" class="selflink"
+			  > Float b <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >e</a
-			  > :: (<a href="#" title="Prelude"
-			  >Float</a
-			  >, <a href="#" title="Prelude"
-			  >Float</a
-			  >) <a href="#" class="selflink"
+			  > :: (Float, Float) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -1714,9 +1578,7 @@
 		      ></span
 		      > <a href="#" title="Test"
 		      >D</a
-		      > <a href="#" title="Data.Int"
-		      >Int</a
-		      ></span
+		      > Int</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -1740,19 +1602,13 @@
 			  >d</a
 			  > :: <a href="#" title="Test"
 			  >T</a
-			  > <a href="#" title="Data.Int"
-			  >Int</a
-			  > b <a href="#" class="selflink"
+			  > Int b <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
 			  >e</a
-			  > :: (<a href="#" title="Data.Int"
-			  >Int</a
-			  >, <a href="#" title="Data.Int"
-			  >Int</a
-			  >) <a href="#" class="selflink"
+			  > :: (Int, Int) <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -1815,9 +1671,7 @@
 	    >a</a
 	    > :: <a href="#" title="Test"
 	    >C</a
-	    > a =&gt; <a href="#" title="System.IO"
-	    >IO</a
-	    > a <a href="#" class="selflink"
+	    > a =&gt; IO a <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -1839,9 +1693,7 @@
 	    >f</a
 	    > :: <a href="#" title="Test"
 	    >C</a
-	    > a =&gt; a -&gt; <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > a =&gt; a -&gt; Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -1901,11 +1753,7 @@ using double quotes: <a href="#"
 	><p class="src"
 	  ><a id="v:g" class="def"
 	    >g</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > -&gt; <a href="#" title="System.IO"
-	    >IO</a
-	    > CInt <a href="#" class="selflink"
+	    > :: Int -&gt; IO CInt <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -2016,11 +1864,7 @@ is at the beginning of the line).</pre
 	><p class="src"
 	  ><a id="v:hidden" class="def"
 	    >hidden</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > -&gt; <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int -&gt; Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
@@ -2133,11 +1977,7 @@ is at the beginning of the line).</pre
 	      ><td class="src"
 		>-&gt; <a href="#" title="Test"
 		  >T2</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  ></td
+		  > Int Int</td
 		><td class="doc"
 		><p
 		  >This argument has type 'T2 Int Int'</p
@@ -2147,17 +1987,9 @@ is at the beginning of the line).</pre
 	      ><td class="src"
 		>-&gt; (<a href="#" title="Test"
 		  >T3</a
-		  > <a href="#" title="Data.Bool"
-		  >Bool</a
-		  > <a href="#" title="Data.Bool"
-		  >Bool</a
-		  > -&gt; <a href="#" title="Test"
+		  > Bool Bool -&gt; <a href="#" title="Test"
 		  >T4</a
-		  > <a href="#" title="Prelude"
-		  >Float</a
-		  > <a href="#" title="Prelude"
-		  >Float</a
-		  >)</td
+		  > Float Float)</td
 		><td class="doc"
 		><p
 		  >This argument has type <code
@@ -2179,9 +2011,7 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href="#" title="System.IO"
-		  >IO</a
-		  > ()</td
+		>-&gt; IO ()</td
 		><td class="doc"
 		><p
 		  >This is the result type</p
@@ -2207,13 +2037,7 @@ is at the beginning of the line).</pre
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: (<a href="#" title="Data.Int"
-		  >Int</a
-		  >, <a href="#" title="Data.Int"
-		  >Int</a
-		  >, <a href="#" title="Prelude"
-		  >Float</a
-		  >)</td
+		>:: (Int, Int, Float)</td
 		><td class="doc"
 		><p
 		  >takes a triple</p
@@ -2221,15 +2045,11 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href="#" title="Data.Int"
-		  >Int</a
-		  ></td
+		>-&gt; Int</td
 		><td class="doc"
 		><p
 		  >returns an <code
-		    ><a href="#" title="Data.Int"
-		      >Int</a
-		      ></code
+		    >Int</code
 		    ></p
 		  ></td
 		></tr
@@ -2267,11 +2087,7 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href="#" title="System.IO"
-		  >IO</a
-		  > <a href="#" title="Data.Int"
-		  >Int</a
-		  ></td
+		>-&gt; IO Int</td
 		><td class="doc"
 		><p
 		  >and the return value</p
@@ -2297,9 +2113,7 @@ is at the beginning of the line).</pre
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: <a href="#" title="Prelude"
-		  >Float</a
-		  ></td
+		>:: Float</td
 		><td class="doc"
 		><p
 		  >The input float</p
@@ -2307,11 +2121,7 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href="#" title="System.IO"
-		  >IO</a
-		  > <a href="#" title="Prelude"
-		  >Float</a
-		  ></td
+		>-&gt; IO Float</td
 		><td class="doc"
 		><p
 		  >The output float</p
@@ -2344,9 +2154,7 @@ is at the beginning of the line).</pre
 	><p class="src"
 	  ><a id="v:f-39-" class="def"
 	    >f'</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -2363,9 +2171,7 @@ is at the beginning of the line).</pre
 	><p class="src"
 	  ><a id="v:withType" class="def"
 	    >withType</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/Threaded.html b/html-test/ref/Threaded.html
index e52ca96b..8728d4cd 100644
--- a/html-test/ref/Threaded.html
+++ b/html-test/ref/Threaded.html
@@ -56,9 +56,7 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >f</a
-	      > :: <a href="#" title="Prelude"
-	      >Integer</a
-	      ></li
+	      > :: Integer</li
 	    ></ul
 	  ></details
 	></div
@@ -69,9 +67,7 @@
 	><p class="src"
 	  ><a id="v:f" class="def"
 	    >f</a
-	    > :: <a href="#" title="Prelude"
-	    >Integer</a
-	    > <a href="#" class="selflink"
+	    > :: Integer <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/Threaded_TH.html b/html-test/ref/Threaded_TH.html
index 14ebe8a9..7f80b127 100644
--- a/html-test/ref/Threaded_TH.html
+++ b/html-test/ref/Threaded_TH.html
@@ -57,11 +57,7 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >forkTH</a
-	      > :: <a href="#" title="Language.Haskell.TH.Syntax"
-	      >Q</a
-	      > <a href="#" title="Language.Haskell.TH.Syntax"
-	      >Exp</a
-	      ></li
+	      > :: Q Exp</li
 	    ></ul
 	  ></details
 	></div
@@ -72,11 +68,7 @@
 	><p class="src"
 	  ><a id="v:forkTH" class="def"
 	    >forkTH</a
-	    > :: <a href="#" title="Language.Haskell.TH.Syntax"
-	    >Q</a
-	    > <a href="#" title="Language.Haskell.TH.Syntax"
-	    >Exp</a
-	    > <a href="#" class="selflink"
+	    > :: Q Exp <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/Ticket112.html b/html-test/ref/Ticket112.html
index 00258deb..a2c4ca1b 100644
--- a/html-test/ref/Ticket112.html
+++ b/html-test/ref/Ticket112.html
@@ -63,9 +63,7 @@
 	  ><div class="doc"
 	  ><p
 	    >...given a raw <code
-	      ><a href="#" title="GHC.Exts"
-		>Addr#</a
-		></code
+	      >Addr#</code
 	      > to the string, and the length of the string.</p
 	    ></div
 	  ></div
diff --git a/html-test/ref/Ticket75.html b/html-test/ref/Ticket75.html
index 70919c1b..683a7184 100644
--- a/html-test/ref/Ticket75.html
+++ b/html-test/ref/Ticket75.html
@@ -54,9 +54,7 @@
 	    ><li class="src short"
 	    ><a href="#"
 	      >f</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ></ul
 	  ></details
 	></div
@@ -91,9 +89,7 @@
 	><p class="src"
 	  ><a id="v:f" class="def"
 	    >f</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/TitledPicture.html b/html-test/ref/TitledPicture.html
index eb6c12f4..1e6f50e0 100644
--- a/html-test/ref/TitledPicture.html
+++ b/html-test/ref/TitledPicture.html
@@ -46,15 +46,11 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >foo</a
-	      > :: <a href="#" title="Prelude"
-	      >Integer</a
-	      ></li
+	      > :: Integer</li
 	    ><li class="src short"
 	    ><a href="#"
 	      >bar</a
-	      > :: <a href="#" title="Prelude"
-	      >Integer</a
-	      ></li
+	      > :: Integer</li
 	    ></ul
 	  ></details
 	></div
@@ -65,9 +61,7 @@
 	><p class="src"
 	  ><a id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href="#" title="Prelude"
-	    >Integer</a
-	    > <a href="#" class="selflink"
+	    > :: Integer <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -84,9 +78,7 @@
 	><p class="src"
 	  ><a id="v:bar" class="def"
 	    >bar</a
-	    > :: <a href="#" title="Prelude"
-	    >Integer</a
-	    > <a href="#" class="selflink"
+	    > :: Integer <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index 190f376e..2195a05a 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -110,9 +110,7 @@
 	      >data family</span
 	      > <a href="#"
 	      >Bat</a
-	      > (a :: k) :: <a href="#" title="Data.Kind"
-	      >*</a
-	      ></li
+	      > (a :: k) :: *</li
 	    ><li class="src short"
 	    ><span class="keyword"
 	      >class</span
@@ -126,17 +124,13 @@
 		  >data</span
 		  > <a href="#"
 		  >AssocD</a
-		  > a :: <a href="#" title="Data.Kind"
-		  >*</a
-		  ></li
+		  > a :: *</li
 		><li
 		><span class="keyword"
 		  >type</span
 		  > <a href="#"
 		  >AssocT</a
-		  > a :: <a href="#" title="Data.Kind"
-		  >*</a
-		  ></li
+		  > a :: *</li
 		></ul
 	      ></li
 	    ><li class="src short"
@@ -286,9 +280,7 @@
 			  >AssocD</a
 			  > <a href="#" title="TypeFamilies"
 			  >X</a
-			  > :: <a href="#" title="Data.Kind"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
@@ -298,9 +290,7 @@
 			  >AssocT</a
 			  > <a href="#" title="TypeFamilies"
 			  >X</a
-			  > :: <a href="#" title="Data.Kind"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -499,9 +489,7 @@
 			>Foo</a
 			> <a href="#" title="TypeFamilies"
 			>X</a
-			> :: <a href="#" title="Data.Kind"
-			>*</a
-			>)</div
+			> :: *)</div
 		      ></details
 		    ></td
 		  ></tr
@@ -622,9 +610,7 @@
 		      >X</a
 		      > <a href="#" title="TypeFamilies"
 		      >&lt;&gt;</a
-		      > (a :: <a href="#" title="Data.Kind"
-		      >*</a
-		      >)</span
+		      > (a :: *)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -647,9 +633,7 @@
 			>X</a
 			> <a href="#" title="TypeFamilies"
 			>&lt;&gt;</a
-			> (a :: <a href="#" title="Data.Kind"
-			>*</a
-			>) = <a href="#" title="TypeFamilies"
+			> (a :: *) = <a href="#" title="TypeFamilies"
 			>X</a
 			></div
 		      ></details
@@ -714,9 +698,7 @@
 			  >AssocD</a
 			  > <a href="#" title="TypeFamilies"
 			  >Y</a
-			  > :: <a href="#" title="Data.Kind"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
@@ -726,9 +708,7 @@
 			  >AssocT</a
 			  > <a href="#" title="TypeFamilies"
 			  >Y</a
-			  > :: <a href="#" title="Data.Kind"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -980,9 +960,7 @@
 		      >Y</a
 		      > <a href="#" title="TypeFamilies"
 		      >&lt;&gt;</a
-		      > (a :: <a href="#" title="Data.Kind"
-		      >*</a
-		      >)</span
+		      > (a :: *)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -1005,9 +983,7 @@
 			>Y</a
 			> <a href="#" title="TypeFamilies"
 			>&lt;&gt;</a
-			> (a :: <a href="#" title="Data.Kind"
-			>*</a
-			>) = a</div
+			> (a :: *) = a</div
 		      ></details
 		    ></td
 		  ></tr
@@ -1097,7 +1073,13 @@
 			><li class="inst"
 			  ><a id="v:BatZ1" class="def"
 			    >BatZ1</a
-			    > :: <a href="#" title="TypeFamilies"
+			    > :: <span class="keyword"
+			    >forall</span
+			    > (z :: <a href="#" title="TypeFamilies"
+			    >Z</a
+			    >). <a href="#" title="TypeFamilies"
+			    >Z</a
+			    > -&gt; <a href="#" title="TypeFamilies"
 			    >Bat</a
 			    > <a href="#" title="TypeFamilies"
 			    >ZA</a
@@ -1105,7 +1087,11 @@
 			  ><li class="inst"
 			  ><a id="v:BatZ2" class="def"
 			    >BatZ2</a
-			    > :: <a href="#" title="TypeFamilies"
+			    > :: <span class="keyword"
+			    >forall</span
+			    > (z :: <a href="#" title="TypeFamilies"
+			    >Z</a
+			    >). {..} -&gt; <a href="#" title="TypeFamilies"
 			    >Bat</a
 			    > <a href="#" title="TypeFamilies"
 			    >ZB</a
@@ -1309,9 +1295,7 @@
 	    >data family</span
 	    > <a id="t:Bat" class="def"
 	    >Bat</a
-	    > (a :: k) :: <a href="#" title="Data.Kind"
-	    >*</a
-	    > <a href="#" class="selflink"
+	    > (a :: k) :: * <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
@@ -1365,7 +1349,13 @@
 			><li class="inst"
 			  ><a id="v:BatZ1" class="def"
 			    >BatZ1</a
-			    > :: <a href="#" title="TypeFamilies"
+			    > :: <span class="keyword"
+			    >forall</span
+			    > (z :: <a href="#" title="TypeFamilies"
+			    >Z</a
+			    >). <a href="#" title="TypeFamilies"
+			    >Z</a
+			    > -&gt; <a href="#" title="TypeFamilies"
 			    >Bat</a
 			    > <a href="#" title="TypeFamilies"
 			    >ZA</a
@@ -1373,7 +1363,11 @@
 			  ><li class="inst"
 			  ><a id="v:BatZ2" class="def"
 			    >BatZ2</a
-			    > :: <a href="#" title="TypeFamilies"
+			    > :: <span class="keyword"
+			    >forall</span
+			    > (z :: <a href="#" title="TypeFamilies"
+			    >Z</a
+			    >). {..} -&gt; <a href="#" title="TypeFamilies"
 			    >Bat</a
 			    > <a href="#" title="TypeFamilies"
 			    >ZB</a
@@ -1518,9 +1512,7 @@
 	      >data</span
 	      > <a id="t:AssocD" class="def"
 	      >AssocD</a
-	      > a :: <a href="#" title="Data.Kind"
-	      >*</a
-	      > <a href="#" class="selflink"
+	      > a :: * <a href="#" class="selflink"
 	      >#</a
 	      ></p
 	    ><div class="doc"
@@ -1532,9 +1524,7 @@
 	      >type</span
 	      > <a id="t:AssocT" class="def"
 	      >AssocT</a
-	      > a :: <a href="#" title="Data.Kind"
-	      >*</a
-	      > <a href="#" class="selflink"
+	      > a :: * <a href="#" class="selflink"
 	      >#</a
 	      ></p
 	    ><div class="doc"
@@ -1584,9 +1574,7 @@
 			  >AssocD</a
 			  > <a href="#" title="TypeFamilies"
 			  >Y</a
-			  > :: <a href="#" title="Data.Kind"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
@@ -1596,9 +1584,7 @@
 			  >AssocT</a
 			  > <a href="#" title="TypeFamilies"
 			  >Y</a
-			  > :: <a href="#" title="Data.Kind"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -1642,9 +1628,7 @@
 			  >AssocD</a
 			  > <a href="#" title="TypeFamilies"
 			  >X</a
-			  > :: <a href="#" title="Data.Kind"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			><p class="src"
@@ -1654,9 +1638,7 @@
 			  >AssocT</a
 			  > <a href="#" title="TypeFamilies"
 			  >X</a
-			  > :: <a href="#" title="Data.Kind"
-			  >*</a
-			  > <a href="#" class="selflink"
+			  > :: * <a href="#" class="selflink"
 			  >#</a
 			  ></p
 			></div
@@ -1780,9 +1762,7 @@
 		      >Y</a
 		      > <a href="#" title="TypeFamilies"
 		      >&lt;&gt;</a
-		      > (a :: <a href="#" title="Data.Kind"
-		      >*</a
-		      >)</span
+		      > (a :: *)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -1805,9 +1785,7 @@
 			>Y</a
 			> <a href="#" title="TypeFamilies"
 			>&lt;&gt;</a
-			> (a :: <a href="#" title="Data.Kind"
-			>*</a
-			>) = a</div
+			> (a :: *) = a</div
 		      ></details
 		    ></td
 		  ></tr
@@ -1822,9 +1800,7 @@
 		      >X</a
 		      > <a href="#" title="TypeFamilies"
 		      >&lt;&gt;</a
-		      > (a :: <a href="#" title="Data.Kind"
-		      >*</a
-		      >)</span
+		      > (a :: *)</span
 		    > <a href="#" class="selflink"
 		    >#</a
 		    ></td
@@ -1847,9 +1823,7 @@
 			>X</a
 			> <a href="#" title="TypeFamilies"
 			>&lt;&gt;</a
-			> (a :: <a href="#" title="Data.Kind"
-			>*</a
-			>) = <a href="#" title="TypeFamilies"
+			> (a :: *) = <a href="#" title="TypeFamilies"
 			>X</a
 			></div
 		      ></details
diff --git a/html-test/ref/Unicode.html b/html-test/ref/Unicode.html
index 26d0d60e..3cae7357 100644
--- a/html-test/ref/Unicode.html
+++ b/html-test/ref/Unicode.html
@@ -46,9 +46,7 @@
 	  ><li class="src short"
 	    ><a href="#"
 	      >x</a
-	      > :: <a href="#" title="Data.Int"
-	      >Int</a
-	      ></li
+	      > :: Int</li
 	    ></ul
 	  ></details
 	></div
@@ -59,9 +57,7 @@
 	><p class="src"
 	  ><a id="v:x" class="def"
 	    >x</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ><div class="doc"
diff --git a/html-test/ref/Visible.html b/html-test/ref/Visible.html
index 308689e4..22c6be6c 100644
--- a/html-test/ref/Visible.html
+++ b/html-test/ref/Visible.html
@@ -45,11 +45,7 @@
 	><p class="src"
 	  ><a id="v:visible" class="def"
 	    >visible</a
-	    > :: <a href="#" title="Data.Int"
-	    >Int</a
-	    > -&gt; <a href="#" title="Data.Int"
-	    >Int</a
-	    > <a href="#" class="selflink"
+	    > :: Int -&gt; Int <a href="#" class="selflink"
 	    >#</a
 	    ></p
 	  ></div
-- 
cgit v1.2.3