From 8d3df49ae1aa2eb58af530bba0c71817411fd49d Mon Sep 17 00:00:00 2001
From: jpmoresmau <jp@moresmau.fr>
Date: Wed, 21 Jan 2015 21:31:24 +0100
Subject: support GHC 7.10: no Safe-Inferred, Foldable instance

---
 html-test/ref/Bug308CrossModule.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

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

diff --git a/html-test/ref/Bug308CrossModule.html b/html-test/ref/Bug308CrossModule.html
index 6a053d3c..093a60c8 100644
--- a/html-test/ref/Bug308CrossModule.html
+++ b/html-test/ref/Bug308CrossModule.html
@@ -35,7 +35,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug308CrossModule.html
 	  ><th
 	    >Safe Haskell</th
 	    ><td
-	    >Safe-Inferred</td
+	    >Safe</td
 	    ></tr
 	  ></table
 	><p class="caption"
-- 
cgit v1.2.3


From 2b2e3108e892b925abeb101609d3e49ec69ef4dc Mon Sep 17 00:00:00 2001
From: Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk>
Date: Sun, 2 Aug 2015 23:58:25 +0100
Subject: Update tests to follow HTML changes

---
 CHANGES                                          |   4 +
 html-test/ref/A.html                             |  16 +-
 html-test/ref/AdvanceTypes.html                  |   8 +-
 html-test/ref/B.html                             |  10 +-
 html-test/ref/Bold.html                          |   4 +-
 html-test/ref/Bug1.html                          |   6 +-
 html-test/ref/Bug195.html                        | 136 +++---
 html-test/ref/Bug2.html                          |   4 +-
 html-test/ref/Bug201.html                        |   6 +-
 html-test/ref/Bug253.html                        |   4 +-
 html-test/ref/Bug26.html                         |  10 +-
 html-test/ref/Bug294.html                        |  18 +-
 html-test/ref/Bug298.html                        |  12 +-
 html-test/ref/Bug3.html                          |   4 +-
 html-test/ref/Bug308.html                        |   6 +-
 html-test/ref/Bug308CrossModule.html             |   4 +-
 html-test/ref/Bug310.html                        |   4 +-
 html-test/ref/Bug313.html                        |   6 +-
 html-test/ref/Bug335.html                        |   6 +-
 html-test/ref/Bug387.html                        |   6 +-
 html-test/ref/Bug4.html                          |   4 +-
 html-test/ref/Bug6.html                          |  88 ++--
 html-test/ref/Bug7.html                          |   8 +-
 html-test/ref/Bug8.html                          |  18 +-
 html-test/ref/Bug85.html                         |  14 +-
 html-test/ref/BugDeprecated.html                 |  14 +-
 html-test/ref/BugExportHeadings.html             |  14 +-
 html-test/ref/Bugs.html                          |   6 +-
 html-test/ref/DeprecatedClass.html               |  10 +-
 html-test/ref/DeprecatedData.html                |  14 +-
 html-test/ref/DeprecatedFunction.html            |   6 +-
 html-test/ref/DeprecatedFunction2.html           |   4 +-
 html-test/ref/DeprecatedFunction3.html           |   4 +-
 html-test/ref/DeprecatedModule.html              |   4 +-
 html-test/ref/DeprecatedModule2.html             |   4 +-
 html-test/ref/DeprecatedNewtype.html             |  10 +-
 html-test/ref/DeprecatedReExport.html            |   4 +-
 html-test/ref/DeprecatedRecord.html              |  60 +--
 html-test/ref/DeprecatedTypeFamily.html          |   6 +-
 html-test/ref/DeprecatedTypeSynonym.html         |   6 +-
 html-test/ref/Examples.html                      |   4 +-
 html-test/ref/Extensions.html                    |   4 +-
 html-test/ref/FunArgs.html                       |  12 +-
 html-test/ref/GADTRecords.html                   |  64 +--
 html-test/ref/Hash.html                          |  14 +-
 html-test/ref/HiddenInstances.html               |   6 +-
 html-test/ref/HiddenInstancesB.html              |   6 +-
 html-test/ref/Hyperlinks.html                    |   4 +-
 html-test/ref/IgnoreExports.html                 |   6 +-
 html-test/ref/ImplicitParams.html                |  12 +-
 html-test/ref/Minimal.html                       |  52 +--
 html-test/ref/ModuleWithWarning.html             |   4 +-
 html-test/ref/NamedDoc.html                      |   2 +-
 html-test/ref/Nesting.html                       |  18 +-
 html-test/ref/NoLayout.html                      |   4 +-
 html-test/ref/NonGreedy.html                     |   4 +-
 html-test/ref/Operators.html                     |  44 +-
 html-test/ref/PatternSyns.html                   |  22 +-
 html-test/ref/Properties.html                    |   4 +-
 html-test/ref/PruneWithWarning.html              |   2 +-
 html-test/ref/QuasiExpr.html                     |  28 +-
 html-test/ref/QuasiQuote.html                    |   4 +-
 html-test/ref/SpuriousSuperclassConstraints.html |   4 +-
 html-test/ref/TH.html                            |   4 +-
 html-test/ref/TH2.html                           |   4 +-
 html-test/ref/Test.html                          | 522 ++++++++++++-----------
 html-test/ref/Threaded.html                      |  16 +-
 html-test/ref/Ticket112.html                     |   4 +-
 html-test/ref/Ticket61.html                      |   6 +-
 html-test/ref/Ticket75.html                      |   8 +-
 html-test/ref/TitledPicture.html                 |   6 +-
 html-test/ref/TypeFamilies.html                  |  76 ++--
 html-test/ref/TypeFamilies2.html                 |  12 +-
 html-test/ref/TypeOperators.html                 |  44 +-
 html-test/ref/Unicode.html                       |   4 +-
 html-test/ref/Visible.html                       |   4 +-
 html-test/ref/haddock-util.js                    |   2 +-
 html-test/ref/mini_FunArgs.html                  |  18 +
 html-test/ref/ocean.css                          |  32 +-
 79 files changed, 853 insertions(+), 805 deletions(-)

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

diff --git a/CHANGES b/CHANGES
index d35528d1..2cb0a5e0 100644
--- a/CHANGES
+++ b/CHANGES
@@ -6,6 +6,10 @@ Changes in version 2.16.2
 
  * Break up response file arguments on newlines
 
+ * Various HTML fixes (#301, #406, #407, #421)
+
+ * Line anchors in hyperlinked source (#420)
+
 Changes in version 2.16.1
 
  * Don't default to type constructors for out-of-scope names (#253 and
diff --git a/html-test/ref/A.html b/html-test/ref/A.html
index 96e2d001..56c04bc6 100644
--- a/html-test/ref/A.html
+++ b/html-test/ref/A.html
@@ -88,7 +88,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:A" class="def"
+	    > <a href="" id="t:A" class="def"
 	    >A</a
 	    ></p
 	  ><div class="subs constructors"
@@ -97,7 +97,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:A" class="def"
+		><a href="" id="v:A" class="def"
 		  >A</a
 		  ></td
 		><td class="doc empty"
@@ -108,7 +108,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:other" class="def"
+	  ><a href="" id="v:other" class="def"
 	    >other</a
 	    > :: <a href=""
 	    >Int</a
@@ -116,7 +116,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:test2" class="def"
+	  ><a href="" id="v:test2" class="def"
 	    >test2</a
 	    > :: <a href=""
 	    >Bool</a
@@ -130,7 +130,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:X" class="def"
+	    > <a href="" id="t:X" class="def"
 	    >X</a
 	    ></p
 	  ><div class="doc"
@@ -143,7 +143,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:X" class="def"
+		><a href="" id="v:X" class="def"
 		  >X</a
 		  ></td
 		><td class="doc"
@@ -156,7 +156,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:reExport" class="def"
+	  ><a href="" id="v:reExport" class="def"
 	    >reExport</a
 	    > :: <a href=""
 	    >Int</a
@@ -172,7 +172,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/AdvanceTypes.html b/html-test/ref/AdvanceTypes.html
index 3ea33ef9..f608efea 100644
--- a/html-test/ref/AdvanceTypes.html
+++ b/html-test/ref/AdvanceTypes.html
@@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_AdvanceTypes.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:Pattern" class="def"
+	    > <a href="" id="t:Pattern" class="def"
 	    >Pattern</a
 	    > :: [*] -&gt; * <span class="keyword"
 	    >where</span
@@ -59,7 +59,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_AdvanceTypes.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:Nil" class="def"
+		><a href="" id="v:Nil" class="def"
 		  >Nil</a
 		  > ::  <a href=""
 		  >Pattern</a
@@ -69,7 +69,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_AdvanceTypes.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:Cons" class="def"
+		><a href="" id="v:Cons" class="def"
 		  >Cons</a
 		  > ::  <a href=""
 		  >Maybe</a
@@ -90,7 +90,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_AdvanceTypes.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/B.html b/html-test/ref/B.html
index 05f3292c..6176cbeb 100644
--- a/html-test/ref/B.html
+++ b/html-test/ref/B.html
@@ -82,7 +82,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:test" class="def"
+	  ><a href="" id="v:test" class="def"
 	    >test</a
 	    > :: <a href=""
 	    >Int</a
@@ -120,7 +120,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:reExport" class="def"
+	  ><a href="" id="v:reExport" class="def"
 	    >reExport</a
 	    > :: <a href=""
 	    >Int</a
@@ -134,7 +134,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:X" class="def"
+	    > <a href="" id="t:X" class="def"
 	    >X</a
 	    ></p
 	  ><div class="doc"
@@ -147,7 +147,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:X" class="def"
+		><a href="" id="v:X" class="def"
 		  >X</a
 		  ></td
 		><td class="doc"
@@ -164,7 +164,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bold.html b/html-test/ref/Bold.html
index 707b5c52..904d2239 100644
--- a/html-test/ref/Bold.html
+++ b/html-test/ref/Bold.html
@@ -56,7 +56,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bold.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: t</p
 	  ><div class="doc"
@@ -92,7 +92,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bold.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug1.html b/html-test/ref/Bug1.html
index 298545cd..28de3c64 100644
--- a/html-test/ref/Bug1.html
+++ b/html-test/ref/Bug1.html
@@ -62,7 +62,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:T" class="def"
+	    > <a href="" id="t:T" class="def"
 	    >T</a
 	    ></p
 	  ><div class="doc"
@@ -80,7 +80,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:T" class="def"
+		><a href="" id="v:T" class="def"
 		  >T</a
 		  ></td
 		><td class="doc empty"
@@ -95,7 +95,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug195.html b/html-test/ref/Bug195.html
index 4f8c05ac..39816f32 100644
--- a/html-test/ref/Bug195.html
+++ b/html-test/ref/Bug195.html
@@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:T" class="def"
+	    > <a href="" id="t:T" class="def"
 	    >T</a
 	    ></p
 	  ><div class="subs constructors"
@@ -57,7 +57,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:A" class="def"
+		><a href="" id="v:A" class="def"
 		  >A</a
 		  ></td
 		><td class="doc empty"
@@ -68,32 +68,34 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:someField" class="def"
-			>someField</a
-			> :: ()</dt
-		      ><dd class="doc"
-		      ><p
-			>Doc for someField of A</p
-			></dd
-		      ><dt class="src"
-		      ><a name="v:someOtherField" class="def"
-			>someOtherField</a
-			> :: ()</dt
-		      ><dd class="doc"
-		      ><p
-			>Doc for someOtherField of A</p
-			></dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:someField" class="def"
+			  >someField</a
+			  > :: ()</dfn
+			><div class="doc"
+			><p
+			  >Doc for someField of A</p
+			  ></div
+			></li
+		      ><li
+		      ><dfn class="src"
+			><a href="" id="v:someOtherField" class="def"
+			  >someOtherField</a
+			  > :: ()</dfn
+			><div class="doc"
+			><p
+			  >Doc for someOtherField of A</p
+			  ></div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:B" class="def"
+		><a href="" id="v:B" class="def"
 		  >B</a
 		  ></td
 		><td class="doc empty"
@@ -104,32 +106,34 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:someField" class="def"
-			>someField</a
-			> :: ()</dt
-		      ><dd class="doc"
-		      ><p
-			>Doc for someField of A</p
-			></dd
-		      ><dt class="src"
-		      ><a name="v:someOtherField" class="def"
-			>someOtherField</a
-			> :: ()</dt
-		      ><dd class="doc"
-		      ><p
-			>Doc for someOtherField of A</p
-			></dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:someField" class="def"
+			  >someField</a
+			  > :: ()</dfn
+			><div class="doc"
+			><p
+			  >Doc for someField of A</p
+			  ></div
+			></li
+		      ><li
+		      ><dfn class="src"
+			><a href="" id="v:someOtherField" class="def"
+			  >someOtherField</a
+			  > :: ()</dfn
+			><div class="doc"
+			><p
+			  >Doc for someOtherField of A</p
+			  ></div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:C" class="def"
+		><a href="" id="v:C" class="def"
 		  >C</a
 		  ></td
 		><td class="doc empty"
@@ -140,26 +144,28 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:someField" class="def"
-			>someField</a
-			> :: ()</dt
-		      ><dd class="doc"
-		      ><p
-			>Doc for someField of A</p
-			></dd
-		      ><dt class="src"
-		      ><a name="v:someOtherField" class="def"
-			>someOtherField</a
-			> :: ()</dt
-		      ><dd class="doc"
-		      ><p
-			>Doc for someOtherField of A</p
-			></dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:someField" class="def"
+			  >someField</a
+			  > :: ()</dfn
+			><div class="doc"
+			><p
+			  >Doc for someField of A</p
+			  ></div
+			></li
+		      ><li
+		      ><dfn class="src"
+			><a href="" id="v:someOtherField" class="def"
+			  >someOtherField</a
+			  > :: ()</dfn
+			><div class="doc"
+			><p
+			  >Doc for someOtherField of A</p
+			  ></div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
@@ -172,7 +178,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug2.html b/html-test/ref/Bug2.html
index 1f5a3a9c..c28fb609 100644
--- a/html-test/ref/Bug2.html
+++ b/html-test/ref/Bug2.html
@@ -46,7 +46,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug2.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:x" class="def"
+	  ><a href="" id="v:x" class="def"
 	    >x</a
 	    > :: <a href=""
 	    >A</a
@@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug2.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug201.html b/html-test/ref/Bug201.html
index d40507da..58bed8e8 100644
--- a/html-test/ref/Bug201.html
+++ b/html-test/ref/Bug201.html
@@ -60,7 +60,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug201.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f" class="def"
+	  ><a href="" id="v:f" class="def"
 	    >f</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -72,7 +72,7 @@ should be dropped
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:g" class="def"
+	  ><a href="" id="v:g" class="def"
 	    >g</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -95,7 +95,7 @@ because there's a space before closing @
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug253.html b/html-test/ref/Bug253.html
index 0802d91e..d8e49bd4 100644
--- a/html-test/ref/Bug253.html
+++ b/html-test/ref/Bug253.html
@@ -72,7 +72,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug253.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="#v:foo" id="v:foo" class="def"
 	    >foo</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -92,7 +92,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug253.html");};
     ><p
       >Produced by <a href="http://www.haskell.org/haddock/"
 	>Haddock</a
-	> version 2.16.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug26.html b/html-test/ref/Bug26.html
index c670264c..8b9e5a7b 100644
--- a/html-test/ref/Bug26.html
+++ b/html-test/ref/Bug26.html
@@ -86,7 +86,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug26.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f" class="def"
+	  ><a href="" id="v:f" class="def"
 	    >f</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -100,7 +100,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug26.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:g" class="def"
+	  ><a href="" id="v:g" class="def"
 	    >g</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -112,7 +112,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug26.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:C" class="def"
+	    > <a href="" id="t:C" class="def"
 	    >C</a
 	    > a <span class="keyword"
 	    >where</span
@@ -129,7 +129,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug26.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a name="v:c_f" class="def"
+	    ><a href="" id="v:c_f" class="def"
 	      >c_f</a
 	      > :: a</p
 	    ><div class="doc"
@@ -170,7 +170,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug26.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.1</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug294.html b/html-test/ref/Bug294.html
index e1022f32..59171bd6 100644
--- a/html-test/ref/Bug294.html
+++ b/html-test/ref/Bug294.html
@@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:A" class="def"
+	    > <a href="" id="t:A" class="def"
 	    >A</a
 	    ></p
 	  ><div class="subs instances"
@@ -65,7 +65,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
 		      >DP</a
 		      > <a href=""
 		      >A</a
-		      > = <a name="v:ProblemCtor-39-" class="def"
+		      > = <a href="" id="v:ProblemCtor-39-" class="def"
 		      >ProblemCtor'</a
 		      > <a href=""
 		      >A</a
@@ -81,7 +81,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
 		      >data</span
 		      > TP <a href=""
 		      >A</a
-		      > = <a name="v:ProblemCtor" class="def"
+		      > = <a href="" id="v:ProblemCtor" class="def"
 		      >ProblemCtor</a
 		      > <a href=""
 		      >A</a
@@ -96,7 +96,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:problemField" class="def"
+	  ><a href="" id="v:problemField" class="def"
 	    >problemField</a
 	    > :: TO <a href=""
 	    >A</a
@@ -106,7 +106,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:problemField-39-" class="def"
+	  ><a href="" id="v:problemField-39-" class="def"
 	    >problemField'</a
 	    > :: DO <a href=""
 	    >A</a
@@ -116,7 +116,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:gadtField" class="def"
+	  ><a href="" id="v:gadtField" class="def"
 	    >gadtField</a
 	    > :: GADT <a href=""
 	    >A</a
@@ -128,7 +128,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a name="t:DP" class="def"
+	    > <a href="" id="t:DP" class="def"
 	    >DP</a
 	    > t :: *</p
 	  ><div class="subs instances"
@@ -145,7 +145,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
 		      >DP</a
 		      > <a href=""
 		      >A</a
-		      > = <a name="v:ProblemCtor-39-" class="def"
+		      > = <a href="" id="v:ProblemCtor-39-" class="def"
 		      >ProblemCtor'</a
 		      > <a href=""
 		      >A</a
@@ -164,7 +164,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.1</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug298.html b/html-test/ref/Bug298.html
index 251fa7d6..9e52da5e 100644
--- a/html-test/ref/Bug298.html
+++ b/html-test/ref/Bug298.html
@@ -72,31 +72,31 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug298.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:-60--94--62-" class="def"
+	  ><a href="" id="v:-60--94--62-" class="def"
 	    >(&lt;^&gt;)</a
 	    > :: (a -&gt; a) -&gt; a -&gt; a</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:-60--94-" class="def"
+	  ><a href="" id="v:-60--94-" class="def"
 	    >(&lt;^)</a
 	    > :: a -&gt; a -&gt; a</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:-94--62-" class="def"
+	  ><a href="" id="v:-94--62-" class="def"
 	    >(^&gt;)</a
 	    > :: a -&gt; a -&gt; a</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:-8902--94-" class="def"
+	  ><a href="" id="v:-8902--94-" class="def"
 	    >(&#8902;^)</a
 	    > :: a -&gt; a -&gt; a</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f" class="def"
+	  ><a href="" id="v:f" class="def"
 	    >f</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -126,7 +126,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug298.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug3.html b/html-test/ref/Bug3.html
index 1ff3db74..70e799be 100644
--- a/html-test/ref/Bug3.html
+++ b/html-test/ref/Bug3.html
@@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug3.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href=""
 	    >Int</a
@@ -75,7 +75,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug3.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug308.html b/html-test/ref/Bug308.html
index c918a1dd..23761bec 100644
--- a/html-test/ref/Bug308.html
+++ b/html-test/ref/Bug308.html
@@ -60,7 +60,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug308.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f" class="def"
+	  ><a href="" id="v:f" class="def"
 	    >f</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -76,7 +76,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug308.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:g" class="def"
+	  ><a href="" id="v:g" class="def"
 	    >g</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -104,7 +104,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug308.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug308CrossModule.html b/html-test/ref/Bug308CrossModule.html
index 093a60c8..fea4c4a5 100644
--- a/html-test/ref/Bug308CrossModule.html
+++ b/html-test/ref/Bug308CrossModule.html
@@ -56,7 +56,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug308CrossModule.html
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:h" class="def"
+	  ><a href="" id="v:h" class="def"
 	    >h</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -84,7 +84,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug308CrossModule.html
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug310.html b/html-test/ref/Bug310.html
index c38af59c..62717c76 100644
--- a/html-test/ref/Bug310.html
+++ b/html-test/ref/Bug310.html
@@ -62,7 +62,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug310.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > a <a name="t:-43-" class="def"
+	    > a <a href="" id="t:-43-" class="def"
 	    >+</a
 	    > b :: <a href=""
 	    >Nat</a
@@ -82,7 +82,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug310.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug313.html b/html-test/ref/Bug313.html
index b0d44a3d..5477cf2c 100644
--- a/html-test/ref/Bug313.html
+++ b/html-test/ref/Bug313.html
@@ -73,7 +73,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug313.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:a" class="def"
+	  ><a href="" id="v:a" class="def"
 	    >a</a
 	    > :: a</p
 	  ><div class="doc"
@@ -97,7 +97,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug313.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:b" class="def"
+	  ><a href="" id="v:b" class="def"
 	    >b</a
 	    > :: a</p
 	  ><div class="doc"
@@ -125,7 +125,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug313.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug335.html b/html-test/ref/Bug335.html
index dbe97422..6b3dc613 100644
--- a/html-test/ref/Bug335.html
+++ b/html-test/ref/Bug335.html
@@ -60,7 +60,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug335.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f" class="def"
+	  ><a href="" id="v:f" class="def"
 	    >f</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -74,7 +74,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug335.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:g" class="def"
+	  ><a href="" id="v:g" class="def"
 	    >g</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -118,7 +118,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug335.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.1</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug387.html b/html-test/ref/Bug387.html
index 2d2009b1..7b605fd0 100644
--- a/html-test/ref/Bug387.html
+++ b/html-test/ref/Bug387.html
@@ -80,7 +80,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug387.html");};
 	  ></h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:test1" class="def"
+	  ><a href="" id="v:test1" class="def"
 	    >test1</a
 	    > :: <a href=""
 	    >Int</a
@@ -92,7 +92,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug387.html");};
 	  ></h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:test2" class="def"
+	  ><a href="" id="v:test2" class="def"
 	    >test2</a
 	    > :: <a href=""
 	    >Int</a
@@ -104,7 +104,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug387.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.1</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug4.html b/html-test/ref/Bug4.html
index 571b8819..f1fab937 100644
--- a/html-test/ref/Bug4.html
+++ b/html-test/ref/Bug4.html
@@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug4.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href=""
 	    >Int</a
@@ -74,7 +74,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug4.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug6.html b/html-test/ref/Bug6.html
index d726bcc1..407a031c 100644
--- a/html-test/ref/Bug6.html
+++ b/html-test/ref/Bug6.html
@@ -132,7 +132,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:A" class="def"
+	    > <a href="" id="t:A" class="def"
 	    >A</a
 	    ></p
 	  ><div class="doc"
@@ -145,7 +145,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:A" class="def"
+		><a href="" id="v:A" class="def"
 		  >A</a
 		  > <a href=""
 		  >Int</a
@@ -160,7 +160,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:B" class="def"
+	    > <a href="" id="t:B" class="def"
 	    >B</a
 	    ></p
 	  ><div class="doc"
@@ -174,7 +174,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:B" class="def"
+		><a href="" id="v:B" class="def"
 		  >B</a
 		  ></td
 		><td class="doc empty"
@@ -185,18 +185,18 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:b" class="def"
-			>b</a
-			> :: <a href=""
-			>Int</a
-			></dt
-		      ><dd class="doc empty"
-		      >&nbsp;</dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:b" class="def"
+			  >b</a
+			  > :: <a href=""
+			  >Int</a
+			  ></dfn
+			><div class="doc empty"
+			>&nbsp;</div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
@@ -207,7 +207,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:C" class="def"
+	    > <a href="" id="t:C" class="def"
 	    >C</a
 	    ></p
 	  ><div class="doc"
@@ -220,7 +220,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:C" class="def"
+		><a href="" id="v:C" class="def"
 		  >C</a
 		  ></td
 		><td class="doc empty"
@@ -231,26 +231,28 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:c1" class="def"
-			>c1</a
-			> :: <a href=""
-			>Int</a
-			></dt
-		      ><dd class="doc empty"
-		      >&nbsp;</dd
-		      ><dt class="src"
-		      ><a name="v:c2" class="def"
-			>c2</a
-			> :: <a href=""
-			>Int</a
-			></dt
-		      ><dd class="doc empty"
-		      >&nbsp;</dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:c1" class="def"
+			  >c1</a
+			  > :: <a href=""
+			  >Int</a
+			  ></dfn
+			><div class="doc empty"
+			>&nbsp;</div
+			></li
+		      ><li
+		      ><dfn class="src"
+			><a href="" id="v:c2" class="def"
+			  >c2</a
+			  > :: <a href=""
+			  >Int</a
+			  ></dfn
+			><div class="doc empty"
+			>&nbsp;</div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
@@ -261,7 +263,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:D" class="def"
+	    > <a href="" id="t:D" class="def"
 	    >D</a
 	    ></p
 	  ><div class="doc"
@@ -275,7 +277,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:D" class="def"
+		><a href="" id="v:D" class="def"
 		  >D</a
 		  > <a href=""
 		  >Int</a
@@ -292,7 +294,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a name="t:E" class="def"
+	    > <a href="" id="t:E" class="def"
 	    >E</a
 	    ></p
 	  ><div class="doc"
@@ -305,7 +307,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:E" class="def"
+		><a href="" id="v:E" class="def"
 		  >E</a
 		  > <a href=""
 		  >Int</a
@@ -322,7 +324,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug7.html b/html-test/ref/Bug7.html
index cea6d150..f1a80c82 100644
--- a/html-test/ref/Bug7.html
+++ b/html-test/ref/Bug7.html
@@ -77,7 +77,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:Foo" class="def"
+	    > <a href="" id="t:Foo" class="def"
 	    >Foo</a
 	    ></p
 	  ><div class="doc"
@@ -90,7 +90,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:Foo" class="def"
+		><a href="" id="v:Foo" class="def"
 		  >Foo</a
 		  ></td
 		><td class="doc empty"
@@ -127,7 +127,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:Bar" class="def"
+	    > <a href="" id="t:Bar" class="def"
 	    >Bar</a
 	    > x y</p
 	  ><div class="doc"
@@ -165,7 +165,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.1</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html
index 0af02f76..6f0bc654 100644
--- a/html-test/ref/Bug8.html
+++ b/html-test/ref/Bug8.html
@@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:Typ" class="def"
+	    > <a href="" id="t:Typ" class="def"
 	    >Typ</a
 	    ></p
 	  ><div class="subs constructors"
@@ -57,7 +57,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:Type" class="def"
+		><a href="" id="v:Type" class="def"
 		  >Type</a
 		  > (<a href=""
 		  >Typ</a
@@ -69,7 +69,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:TFree" class="def"
+		><a href="" id="v:TFree" class="def"
 		  >TFree</a
 		  > (<a href=""
 		  >Typ</a
@@ -84,7 +84,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:-45--45--62-" class="def"
+	  ><a href="" id="v:-45--45--62-" class="def"
 	    >(--&gt;)</a
 	    > :: t -&gt; t1 -&gt; <a href=""
 	    >Typ</a
@@ -96,7 +96,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:-45--45--45--62-" class="def"
+	  ><a href="" id="v:-45--45--45--62-" class="def"
 	    >(---&gt;)</a
 	    > :: <a href=""
 	    >Foldable</a
@@ -112,19 +112,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:s" class="def"
+	  ><a href="" id="v:s" class="def"
 	    >s</a
 	    > :: t</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:t" class="def"
+	  ><a href="" id="v:t" class="def"
 	    >t</a
 	    > :: t</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:main" class="def"
+	  ><a href="" id="v:main" class="def"
 	    >main</a
 	    > :: t</p
 	  ></div
@@ -134,7 +134,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bug85.html b/html-test/ref/Bug85.html
index 83bd93d9..e1f0431f 100644
--- a/html-test/ref/Bug85.html
+++ b/html-test/ref/Bug85.html
@@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug85.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:Foo" class="def"
+	    > <a href="" id="t:Foo" class="def"
 	    >Foo</a
 	    > :: (* -&gt; *) -&gt; * -&gt; * <span class="keyword"
 	    >where</span
@@ -59,7 +59,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug85.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:Bar" class="def"
+		><a href="" id="v:Bar" class="def"
 		  >Bar</a
 		  > ::  f x -&gt; <a href=""
 		  >Foo</a
@@ -74,7 +74,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug85.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:Baz" class="def"
+	    > <a href="" id="t:Baz" class="def"
 	    >Baz</a
 	    > :: * <span class="keyword"
 	    >where</span
@@ -85,7 +85,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug85.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:Baz-39-" class="def"
+		><a href="" id="v:Baz-39-" class="def"
 		  >Baz'</a
 		  > ::  <a href=""
 		  >Baz</a
@@ -100,7 +100,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug85.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:Qux" class="def"
+	    > <a href="" id="t:Qux" class="def"
 	    >Qux</a
 	    > <span class="keyword"
 	    >where</span
@@ -111,7 +111,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug85.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:Quux" class="def"
+		><a href="" id="v:Quux" class="def"
 		  >Quux</a
 		  > ::  <a href=""
 		  >Qux</a
@@ -128,7 +128,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug85.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/BugDeprecated.html b/html-test/ref/BugDeprecated.html
index 7ae2fe89..28cf89be 100644
--- a/html-test/ref/BugDeprecated.html
+++ b/html-test/ref/BugDeprecated.html
@@ -88,7 +88,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href=""
 	    >Int</a
@@ -102,7 +102,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:bar" class="def"
+	  ><a href="" id="v:bar" class="def"
 	    >bar</a
 	    > :: <a href=""
 	    >Int</a
@@ -116,7 +116,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:baz" class="def"
+	  ><a href="" id="v:baz" class="def"
 	    >baz</a
 	    > :: <a href=""
 	    >Int</a
@@ -130,7 +130,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:one" class="def"
+	  ><a href="" id="v:one" class="def"
 	    >one</a
 	    > :: <a href=""
 	    >Int</a
@@ -146,7 +146,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:two" class="def"
+	  ><a href="" id="v:two" class="def"
 	    >two</a
 	    > :: <a href=""
 	    >Int</a
@@ -160,7 +160,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:three" class="def"
+	  ><a href="" id="v:three" class="def"
 	    >three</a
 	    > :: <a href=""
 	    >Int</a
@@ -178,7 +178,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/BugExportHeadings.html b/html-test/ref/BugExportHeadings.html
index a552a80f..d6ae0359 100644
--- a/html-test/ref/BugExportHeadings.html
+++ b/html-test/ref/BugExportHeadings.html
@@ -118,7 +118,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
 	>Foo</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href=""
 	    >Int</a
@@ -128,7 +128,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
 	>Bar</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:bar" class="def"
+	  ><a href="" id="v:bar" class="def"
 	    >bar</a
 	    > :: <a href=""
 	    >Int</a
@@ -138,7 +138,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
 	>Baz</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:baz" class="def"
+	  ><a href="" id="v:baz" class="def"
 	    >baz</a
 	    > :: <a href=""
 	    >Int</a
@@ -148,7 +148,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
 	>One</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:one" class="def"
+	  ><a href="" id="v:one" class="def"
 	    >one</a
 	    > :: <a href=""
 	    >Int</a
@@ -164,7 +164,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
 	>Two</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:two" class="def"
+	  ><a href="" id="v:two" class="def"
 	    >two</a
 	    > :: <a href=""
 	    >Int</a
@@ -180,7 +180,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
 	>Three</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:three" class="def"
+	  ><a href="" id="v:three" class="def"
 	    >three</a
 	    > :: <a href=""
 	    >Int</a
@@ -198,7 +198,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Bugs.html b/html-test/ref/Bugs.html
index bb3ce17c..78807f43 100644
--- a/html-test/ref/Bugs.html
+++ b/html-test/ref/Bugs.html
@@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bugs.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:A" class="def"
+	    > <a href="" id="t:A" class="def"
 	    >A</a
 	    > a</p
 	  ><div class="subs constructors"
@@ -57,7 +57,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bugs.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:A" class="def"
+		><a href="" id="v:A" class="def"
 		  >A</a
 		  > a (a -&gt; <a href=""
 		  >Int</a
@@ -74,7 +74,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bugs.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/DeprecatedClass.html b/html-test/ref/DeprecatedClass.html
index c7bf4370..7bf4b41c 100644
--- a/html-test/ref/DeprecatedClass.html
+++ b/html-test/ref/DeprecatedClass.html
@@ -82,7 +82,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html")
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:SomeClass" class="def"
+	    > <a href="" id="t:SomeClass" class="def"
 	    >SomeClass</a
 	    > a <span class="keyword"
 	    >where</span
@@ -99,7 +99,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html")
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a name="v:foo" class="def"
+	    ><a href="" id="v:foo" class="def"
 	      >foo</a
 	      > :: a -&gt; a</p
 	    ><div class="doc"
@@ -116,7 +116,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html")
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:SomeOtherClass" class="def"
+	    > <a href="" id="t:SomeOtherClass" class="def"
 	    >SomeOtherClass</a
 	    > a <span class="keyword"
 	    >where</span
@@ -131,7 +131,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html")
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a name="v:bar" class="def"
+	    ><a href="" id="v:bar" class="def"
 	      >bar</a
 	      > :: a -&gt; a</p
 	    ><div class="doc"
@@ -148,7 +148,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html")
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/DeprecatedData.html b/html-test/ref/DeprecatedData.html
index 291f1ec2..0a90e110 100644
--- a/html-test/ref/DeprecatedData.html
+++ b/html-test/ref/DeprecatedData.html
@@ -86,7 +86,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:Foo" class="def"
+	    > <a href="" id="t:Foo" class="def"
 	    >Foo</a
 	    ></p
 	  ><div class="doc"
@@ -103,7 +103,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:Foo" class="def"
+		><a href="" id="v:Foo" class="def"
 		  >Foo</a
 		  ></td
 		><td class="doc"
@@ -117,7 +117,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:Bar" class="def"
+		><a href="" id="v:Bar" class="def"
 		  >Bar</a
 		  ></td
 		><td class="doc"
@@ -136,7 +136,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:One" class="def"
+	    > <a href="" id="t:One" class="def"
 	    >One</a
 	    ></p
 	  ><div class="doc"
@@ -151,7 +151,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:One" class="def"
+		><a href="" id="v:One" class="def"
 		  >One</a
 		  ></td
 		><td class="doc"
@@ -163,7 +163,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:Two" class="def"
+		><a href="" id="v:Two" class="def"
 		  >Two</a
 		  ></td
 		><td class="doc"
@@ -182,7 +182,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/DeprecatedFunction.html b/html-test/ref/DeprecatedFunction.html
index e3992660..b015bc95 100644
--- a/html-test/ref/DeprecatedFunction.html
+++ b/html-test/ref/DeprecatedFunction.html
@@ -64,7 +64,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction.htm
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href=""
 	    >Int</a
@@ -84,7 +84,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction.htm
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:bar" class="def"
+	  ><a href="" id="v:bar" class="def"
 	    >bar</a
 	    > :: <a href=""
 	    >Int</a
@@ -100,7 +100,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction.htm
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/DeprecatedFunction2.html b/html-test/ref/DeprecatedFunction2.html
index 52d44e01..46a509ee 100644
--- a/html-test/ref/DeprecatedFunction2.html
+++ b/html-test/ref/DeprecatedFunction2.html
@@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction2.ht
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href=""
 	    >Int</a
@@ -76,7 +76,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction2.ht
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/DeprecatedFunction3.html b/html-test/ref/DeprecatedFunction3.html
index 1d49c45e..1749d024 100644
--- a/html-test/ref/DeprecatedFunction3.html
+++ b/html-test/ref/DeprecatedFunction3.html
@@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction3.ht
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href=""
 	    >Integer</a
@@ -76,7 +76,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction3.ht
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/DeprecatedModule.html b/html-test/ref/DeprecatedModule.html
index d31fcd5c..1dd3fb45 100644
--- a/html-test/ref/DeprecatedModule.html
+++ b/html-test/ref/DeprecatedModule.html
@@ -62,7 +62,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedModule.html"
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href=""
 	    >Int</a
@@ -74,7 +74,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedModule.html"
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/DeprecatedModule2.html b/html-test/ref/DeprecatedModule2.html
index b10984f7..dea6dc97 100644
--- a/html-test/ref/DeprecatedModule2.html
+++ b/html-test/ref/DeprecatedModule2.html
@@ -56,7 +56,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedModule2.html
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href=""
 	    >Int</a
@@ -68,7 +68,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedModule2.html
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/DeprecatedNewtype.html b/html-test/ref/DeprecatedNewtype.html
index 41ddde90..c521ec33 100644
--- a/html-test/ref/DeprecatedNewtype.html
+++ b/html-test/ref/DeprecatedNewtype.html
@@ -74,7 +74,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a name="t:SomeNewType" class="def"
+	    > <a href="" id="t:SomeNewType" class="def"
 	    >SomeNewType</a
 	    ></p
 	  ><div class="doc"
@@ -91,7 +91,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:SomeNewTypeConst" class="def"
+		><a href="" id="v:SomeNewTypeConst" class="def"
 		  >SomeNewTypeConst</a
 		  > <a href=""
 		  >String</a
@@ -112,7 +112,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a name="t:SomeOtherNewType" class="def"
+	    > <a href="" id="t:SomeOtherNewType" class="def"
 	    >SomeOtherNewType</a
 	    ></p
 	  ><div class="doc"
@@ -127,7 +127,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:SomeOtherNewTypeConst" class="def"
+		><a href="" id="v:SomeOtherNewTypeConst" class="def"
 		  >SomeOtherNewTypeConst</a
 		  > <a href=""
 		  >String</a
@@ -148,7 +148,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/DeprecatedReExport.html b/html-test/ref/DeprecatedReExport.html
index 9fc2ca2b..f73c2996 100644
--- a/html-test/ref/DeprecatedReExport.html
+++ b/html-test/ref/DeprecatedReExport.html
@@ -84,7 +84,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedReExport.htm
 	>Re-exported from an other module</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href=""
 	    >Int</a
@@ -117,7 +117,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedReExport.htm
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/DeprecatedRecord.html b/html-test/ref/DeprecatedRecord.html
index 9917b934..5991b7dc 100644
--- a/html-test/ref/DeprecatedRecord.html
+++ b/html-test/ref/DeprecatedRecord.html
@@ -76,7 +76,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html"
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:Foo" class="def"
+	    > <a href="" id="t:Foo" class="def"
 	    >Foo</a
 	    ></p
 	  ><div class="doc"
@@ -89,7 +89,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html"
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:Foo" class="def"
+		><a href="" id="v:Foo" class="def"
 		  >Foo</a
 		  ></td
 		><td class="doc empty"
@@ -100,34 +100,36 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html"
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:fooName" class="def"
-			>fooName</a
-			> :: <a href=""
-			>String</a
-			></dt
-		      ><dd class="doc"
-		      ><p
-			>some name</p
-			></dd
-		      ><dt class="src"
-		      ><a name="v:fooValue" class="def"
-			>fooValue</a
-			> :: <a href=""
-			>Int</a
-			></dt
-		      ><dd class="doc"
-		      ><div class="warning"
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:fooName" class="def"
+			  >fooName</a
+			  > :: <a href=""
+			  >String</a
+			  ></dfn
+			><div class="doc"
 			><p
-			  >Deprecated: do not use this</p
+			  >some name</p
 			  ></div
-			><p
-			>some value</p
-			></dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+			></li
+		      ><li
+		      ><dfn class="src"
+			><a href="" id="v:fooValue" class="def"
+			  >fooValue</a
+			  > :: <a href=""
+			  >Int</a
+			  ></dfn
+			><div class="doc"
+			><div class="warning"
+			  ><p
+			    >Deprecated: do not use this</p
+			    ></div
+			  ><p
+			  >some value</p
+			  ></div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
@@ -140,7 +142,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html"
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/DeprecatedTypeFamily.html b/html-test/ref/DeprecatedTypeFamily.html
index c4ed22c5..175c1b25 100644
--- a/html-test/ref/DeprecatedTypeFamily.html
+++ b/html-test/ref/DeprecatedTypeFamily.html
@@ -66,7 +66,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeFamily.h
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a name="t:SomeTypeFamily" class="def"
+	    > <a href="" id="t:SomeTypeFamily" class="def"
 	    >SomeTypeFamily</a
 	    > k :: * -&gt; *</p
 	  ><div class="doc"
@@ -82,7 +82,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeFamily.h
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a name="t:SomeOtherTypeFamily" class="def"
+	    > <a href="" id="t:SomeOtherTypeFamily" class="def"
 	    >SomeOtherTypeFamily</a
 	    > k :: * -&gt; *</p
 	  ><div class="doc"
@@ -98,7 +98,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeFamily.h
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/DeprecatedTypeSynonym.html b/html-test/ref/DeprecatedTypeSynonym.html
index 19400697..0f986624 100644
--- a/html-test/ref/DeprecatedTypeSynonym.html
+++ b/html-test/ref/DeprecatedTypeSynonym.html
@@ -70,7 +70,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeSynonym.
 	><p class="src"
 	  ><span class="keyword"
 	    >type</span
-	    > <a name="t:TypeSyn" class="def"
+	    > <a href="" id="t:TypeSyn" class="def"
 	    >TypeSyn</a
 	    > = <a href=""
 	    >String</a
@@ -88,7 +88,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeSynonym.
 	><p class="src"
 	  ><span class="keyword"
 	    >type</span
-	    > <a name="t:OtherTypeSyn" class="def"
+	    > <a href="" id="t:OtherTypeSyn" class="def"
 	    >OtherTypeSyn</a
 	    > = <a href=""
 	    >String</a
@@ -106,7 +106,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeSynonym.
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Examples.html b/html-test/ref/Examples.html
index 0c2ee985..57c359df 100644
--- a/html-test/ref/Examples.html
+++ b/html-test/ref/Examples.html
@@ -60,7 +60,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Examples.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:fib" class="def"
+	  ><a href="" id="v:fib" class="def"
 	    >fib</a
 	    > :: <a href=""
 	    >Integer</a
@@ -167,7 +167,7 @@ bar
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Extensions.html b/html-test/ref/Extensions.html
index 60db67af..780466b8 100644
--- a/html-test/ref/Extensions.html
+++ b/html-test/ref/Extensions.html
@@ -68,7 +68,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Extensions.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foobar" class="def"
+	  ><a href="" id="v:foobar" class="def"
 	    >foobar</a
 	    > :: t</p
 	  ><div class="doc"
@@ -82,7 +82,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Extensions.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/FunArgs.html b/html-test/ref/FunArgs.html
index 8c4b4552..d889b611 100644
--- a/html-test/ref/FunArgs.html
+++ b/html-test/ref/FunArgs.html
@@ -46,7 +46,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f" class="def"
+	  ><a href="" id="v:f" class="def"
 	    >f</a
 	    ></p
 	  ><div class="subs arguments"
@@ -110,7 +110,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:g" class="def"
+	  ><a href="" id="v:g" class="def"
 	    >g</a
 	    ></p
 	  ><div class="subs arguments"
@@ -154,7 +154,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:h" class="def"
+	  ><a href="" id="v:h" class="def"
 	    >h</a
 	    ></p
 	  ><div class="subs arguments"
@@ -198,7 +198,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:i" class="def"
+	  ><a href="" id="v:i" class="def"
 	    >i</a
 	    ></p
 	  ><div class="subs arguments"
@@ -238,7 +238,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:j" class="def"
+	  ><a href="" id="v:j" class="def"
 	    >j</a
 	    ></p
 	  ><div class="subs arguments"
@@ -274,7 +274,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/GADTRecords.html b/html-test/ref/GADTRecords.html
index a5f86a50..b5b60d0f 100644
--- a/html-test/ref/GADTRecords.html
+++ b/html-test/ref/GADTRecords.html
@@ -110,7 +110,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:H1" class="def"
+	    > <a href="" id="t:H1" class="def"
 	    >H1</a
 	    > a b <span class="keyword"
 	    >where</span
@@ -125,7 +125,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:C1" class="def"
+		><a href="" id="v:C1" class="def"
 		  >C1</a
 		  > ::  <a href=""
 		  >H1</a
@@ -135,7 +135,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:C2" class="def"
+		><a href="" id="v:C2" class="def"
 		  >C2</a
 		  > :: <a href=""
 		  >Ord</a
@@ -147,7 +147,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:C3" class="def"
+		><a href="" id="v:C3" class="def"
 		  >C3</a
 		  > ::  <a href=""
 		  >Int</a
@@ -166,26 +166,26 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:field" class="def"
-			>field</a
-			> :: <a href=""
-			>Int</a
-			></dt
-		      ><dd class="doc"
-		      ><p
-			>hello docs</p
-			></dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:field" class="def"
+			  >field</a
+			  > :: <a href=""
+			  >Int</a
+			  ></dfn
+			><div class="doc"
+			><p
+			  >hello docs</p
+			  ></div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:C4" class="def"
+		><a href="" id="v:C4" class="def"
 		  >C4</a
 		  > ::  a -&gt; <a href=""
 		  >H1</a
@@ -200,18 +200,18 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:field2" class="def"
-			>field2</a
-			> :: a</dt
-		      ><dd class="doc"
-		      ><p
-			>hello2 docs</p
-			></dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:field2" class="def"
+			  >field2</a
+			  > :: a</dfn
+			><div class="doc"
+			><p
+			  >hello2 docs</p
+			  ></div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
@@ -224,7 +224,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html
index bc8ea095..0c9f4e2c 100644
--- a/html-test/ref/Hash.html
+++ b/html-test/ref/Hash.html
@@ -147,7 +147,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:HashTable" class="def"
+	    > <a href="" id="t:HashTable" class="def"
 	    >HashTable</a
 	    > key val</p
 	  ><div class="doc"
@@ -172,7 +172,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	  >s</h2
 	><div class="top"
 	><p class="src"
-	  ><a name="v:new" class="def"
+	  ><a href="" id="v:new" class="def"
 	    >new</a
 	    > :: (<a href=""
 	    >Eq</a
@@ -192,7 +192,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:insert" class="def"
+	  ><a href="" id="v:insert" class="def"
 	    >insert</a
 	    > :: (<a href=""
 	    >Eq</a
@@ -208,7 +208,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:lookup" class="def"
+	  ><a href="" id="v:lookup" class="def"
 	    >lookup</a
 	    > :: <a href=""
 	    >Hash</a
@@ -241,7 +241,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:Hash" class="def"
+	    > <a href="" id="t:Hash" class="def"
 	    >Hash</a
 	    > a <span class="keyword"
 	    >where</span
@@ -254,7 +254,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a name="v:hash" class="def"
+	    ><a href="" id="v:hash" class="def"
 	      >hash</a
 	      > :: a -&gt; <a href=""
 	      >Int</a
@@ -323,7 +323,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.1</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/HiddenInstances.html b/html-test/ref/HiddenInstances.html
index a0d84fb7..9edd70d1 100644
--- a/html-test/ref/HiddenInstances.html
+++ b/html-test/ref/HiddenInstances.html
@@ -66,7 +66,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:VisibleClass" class="def"
+	    > <a href="" id="t:VisibleClass" class="def"
 	    >VisibleClass</a
 	    > a</p
 	  ><div class="doc"
@@ -114,7 +114,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:VisibleData" class="def"
+	    > <a href="" id="t:VisibleData" class="def"
 	    >VisibleData</a
 	    ></p
 	  ><div class="doc"
@@ -164,7 +164,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.1</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/HiddenInstancesB.html b/html-test/ref/HiddenInstancesB.html
index 40e6a5ba..f117a8fd 100644
--- a/html-test/ref/HiddenInstancesB.html
+++ b/html-test/ref/HiddenInstancesB.html
@@ -66,7 +66,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html"
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:Foo" class="def"
+	    > <a href="" id="t:Foo" class="def"
 	    >Foo</a
 	    > a</p
 	  ><div class="doc"
@@ -100,7 +100,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html"
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:Bar" class="def"
+	    > <a href="" id="t:Bar" class="def"
 	    >Bar</a
 	    ></p
 	  ><div class="doc"
@@ -136,7 +136,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html"
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.1</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Hyperlinks.html b/html-test/ref/Hyperlinks.html
index 485ad835..b5547e50 100644
--- a/html-test/ref/Hyperlinks.html
+++ b/html-test/ref/Hyperlinks.html
@@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hyperlinks.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href=""
 	    >Int</a
@@ -80,7 +80,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hyperlinks.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/IgnoreExports.html b/html-test/ref/IgnoreExports.html
index c2572172..6591f0d3 100644
--- a/html-test/ref/IgnoreExports.html
+++ b/html-test/ref/IgnoreExports.html
@@ -64,7 +64,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_IgnoreExports.html");}
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href=""
 	    >Int</a
@@ -76,7 +76,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_IgnoreExports.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:bar" class="def"
+	  ><a href="" id="v:bar" class="def"
 	    >bar</a
 	    > :: <a href=""
 	    >Int</a
@@ -92,7 +92,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_IgnoreExports.html");}
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/ImplicitParams.html b/html-test/ref/ImplicitParams.html
index bce05bf4..c81f484b 100644
--- a/html-test/ref/ImplicitParams.html
+++ b/html-test/ref/ImplicitParams.html
@@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_ImplicitParams.html");
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:X" class="def"
+	    > <a href="" id="t:X" class="def"
 	    >X</a
 	    ></p
 	  ><div class="subs constructors"
@@ -57,7 +57,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_ImplicitParams.html");
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:X" class="def"
+		><a href="" id="v:X" class="def"
 		  >X</a
 		  ></td
 		><td class="doc empty"
@@ -68,7 +68,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_ImplicitParams.html");
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:c" class="def"
+	  ><a href="" id="v:c" class="def"
 	    >c</a
 	    > :: (?x :: <a href=""
 	    >X</a
@@ -78,7 +78,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_ImplicitParams.html");
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:d" class="def"
+	  ><a href="" id="v:d" class="def"
 	    >d</a
 	    > :: (?x :: <a href=""
 	    >X</a
@@ -92,7 +92,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_ImplicitParams.html");
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f" class="def"
+	  ><a href="" id="v:f" class="def"
 	    >f</a
 	    > :: ((?x :: <a href=""
 	    >X</a
@@ -104,7 +104,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_ImplicitParams.html");
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Minimal.html b/html-test/ref/Minimal.html
index dae90f2b..48c469d1 100644
--- a/html-test/ref/Minimal.html
+++ b/html-test/ref/Minimal.html
@@ -56,7 +56,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:Foo" class="def"
+	    > <a href="" id="t:Foo" class="def"
 	    >Foo</a
 	    > a <span class="keyword"
 	    >where</span
@@ -85,7 +85,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a name="v:foo" class="def"
+	    ><a href="" id="v:foo" class="def"
 	      >foo</a
 	      > :: a</p
 	    ><div class="doc"
@@ -93,15 +93,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	      >Any two of these are required...</p
 	      ></div
 	    ><p class="src"
-	    ><a name="v:bar" class="def"
+	    ><a href="" id="v:bar" class="def"
 	      >bar</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a name="v:bat" class="def"
+	    ><a href="" id="v:bat" class="def"
 	      >bat</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a name="v:fooBarBat" class="def"
+	    ><a href="" id="v:fooBarBat" class="def"
 	      >fooBarBat</a
 	      > :: (a, a, a)</p
 	    ><div class="doc"
@@ -114,7 +114,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:Weird" class="def"
+	    > <a href="" id="t:Weird" class="def"
 	    >Weird</a
 	    > a <span class="keyword"
 	    >where</span
@@ -143,31 +143,31 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a name="v:a" class="def"
+	    ><a href="" id="v:a" class="def"
 	      >a</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a name="v:b" class="def"
+	    ><a href="" id="v:b" class="def"
 	      >b</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a name="v:c" class="def"
+	    ><a href="" id="v:c" class="def"
 	      >c</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a name="v:d" class="def"
+	    ><a href="" id="v:d" class="def"
 	      >d</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a name="v:e" class="def"
+	    ><a href="" id="v:e" class="def"
 	      >e</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a name="v:f" class="def"
+	    ><a href="" id="v:f" class="def"
 	      >f</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a name="v:g" class="def"
+	    ><a href="" id="v:g" class="def"
 	      >g</a
 	      > :: a</p
 	    ></div
@@ -176,7 +176,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:NoMins" class="def"
+	    > <a href="" id="t:NoMins" class="def"
 	    >NoMins</a
 	    > a <span class="keyword"
 	    >where</span
@@ -195,15 +195,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a name="v:x" class="def"
+	    ><a href="" id="v:x" class="def"
 	      >x</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a name="v:y" class="def"
+	    ><a href="" id="v:y" class="def"
 	      >y</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a name="v:z" class="def"
+	    ><a href="" id="v:z" class="def"
 	      >z</a
 	      > :: a</p
 	    ></div
@@ -212,7 +212,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:FullMin" class="def"
+	    > <a href="" id="t:FullMin" class="def"
 	    >FullMin</a
 	    > a <span class="keyword"
 	    >where</span
@@ -221,11 +221,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a name="v:aaa" class="def"
+	    ><a href="" id="v:aaa" class="def"
 	      >aaa</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a name="v:bbb" class="def"
+	    ><a href="" id="v:bbb" class="def"
 	      >bbb</a
 	      > :: a</p
 	    ></div
@@ -234,7 +234,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:PartialMin" class="def"
+	    > <a href="" id="t:PartialMin" class="def"
 	    >PartialMin</a
 	    > a <span class="keyword"
 	    >where</span
@@ -251,7 +251,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a name="v:ccc" class="def"
+	    ><a href="" id="v:ccc" class="def"
 	      >ccc</a
 	      > :: a</p
 	    ></div
@@ -260,7 +260,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:EmptyMin" class="def"
+	    > <a href="" id="t:EmptyMin" class="def"
 	    >EmptyMin</a
 	    > a <span class="keyword"
 	    >where</span
@@ -275,11 +275,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a name="v:eee" class="def"
+	    ><a href="" id="v:eee" class="def"
 	      >eee</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a name="v:fff" class="def"
+	    ><a href="" id="v:fff" class="def"
 	      >fff</a
 	      > :: a</p
 	    ></div
@@ -290,7 +290,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/ModuleWithWarning.html b/html-test/ref/ModuleWithWarning.html
index 7f01e2c6..fa2a6787 100644
--- a/html-test/ref/ModuleWithWarning.html
+++ b/html-test/ref/ModuleWithWarning.html
@@ -62,7 +62,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_ModuleWithWarning.html
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href=""
 	    >Int</a
@@ -74,7 +74,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_ModuleWithWarning.html
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/NamedDoc.html b/html-test/ref/NamedDoc.html
index 2f678fb0..64e18711 100644
--- a/html-test/ref/NamedDoc.html
+++ b/html-test/ref/NamedDoc.html
@@ -60,7 +60,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NamedDoc.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Nesting.html b/html-test/ref/Nesting.html
index 542d6db7..7bba5148 100644
--- a/html-test/ref/Nesting.html
+++ b/html-test/ref/Nesting.html
@@ -84,7 +84,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Nesting.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:d" class="def"
+	  ><a href="" id="v:d" class="def"
 	    >d</a
 	    > :: t</p
 	  ><div class="doc"
@@ -116,7 +116,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Nesting.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:e" class="def"
+	  ><a href="" id="v:e" class="def"
 	    >e</a
 	    > :: t</p
 	  ><div class="doc"
@@ -137,7 +137,7 @@ the presence of this text pushes it out of nesting back to the top.</li
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f" class="def"
+	  ><a href="" id="v:f" class="def"
 	    >f</a
 	    > :: t</p
 	  ><div class="doc"
@@ -155,7 +155,7 @@ the presence of this text pushes it out of nesting back to the top.</li
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:g" class="def"
+	  ><a href="" id="v:g" class="def"
 	    >g</a
 	    > :: t</p
 	  ><div class="doc"
@@ -173,7 +173,7 @@ the presence of this text pushes it out of nesting back to the top.</li
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:h" class="def"
+	  ><a href="" id="v:h" class="def"
 	    >h</a
 	    > :: t</p
 	  ><div class="doc"
@@ -191,7 +191,7 @@ tracks</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:i" class="def"
+	  ><a href="" id="v:i" class="def"
 	    >i</a
 	    > :: t</p
 	  ><div class="doc"
@@ -241,7 +241,7 @@ More of the indented list.</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:j" class="def"
+	  ><a href="" id="v:j" class="def"
 	    >j</a
 	    > :: t</p
 	  ><div class="doc"
@@ -309,7 +309,7 @@ with more of the indented list content.</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:k" class="def"
+	  ><a href="" id="v:k" class="def"
 	    >k</a
 	    > :: t</p
 	  ><div class="doc"
@@ -338,7 +338,7 @@ with more of the indented list content.</p
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.1</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/NoLayout.html b/html-test/ref/NoLayout.html
index 8cfc8e81..8b47eab8 100644
--- a/html-test/ref/NoLayout.html
+++ b/html-test/ref/NoLayout.html
@@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NoLayout.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:g" class="def"
+	  ><a href="" id="v:g" class="def"
 	    >g</a
 	    > :: <a href=""
 	    >Int</a
@@ -78,7 +78,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NoLayout.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/NonGreedy.html b/html-test/ref/NonGreedy.html
index e62459bc..c22c8ea9 100644
--- a/html-test/ref/NonGreedy.html
+++ b/html-test/ref/NonGreedy.html
@@ -56,7 +56,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f" class="def"
+	  ><a href="" id="v:f" class="def"
 	    >f</a
 	    > :: a</p
 	  ><div class="doc"
@@ -74,7 +74,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index 1e49fd2b..6ac8ae38 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -176,7 +176,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:-43--45-" class="def"
+	  ><a href="" id="v:-43--45-" class="def"
 	    >(+-)</a
 	    > :: a -&gt; a -&gt; a</p
 	  ><div class="doc"
@@ -186,7 +186,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:-42--47-" class="def"
+	  ><a href="" id="v:-42--47-" class="def"
 	    >(*/)</a
 	    > :: a -&gt; a -&gt; a <span class="fixity"
 	    >infixr 7</span
@@ -200,7 +200,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: a -&gt; a -&gt; a <span class="fixity"
 	    >infixl 3</span
@@ -216,7 +216,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:Foo" class="def"
+	    > <a href="" id="t:Foo" class="def"
 	    >Foo</a
 	    ></p
 	  ><div class="doc"
@@ -231,7 +231,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	      ><td class="src"
 		><a href=""
 		  >Foo</a
-		  > <a name="v:Bar" class="def"
+		  > <a href="" id="v:Bar" class="def"
 		  >`Bar`</a
 		  > <a href=""
 		  >Foo</a
@@ -249,7 +249,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	      ><td class="src"
 		><a href=""
 		  >Foo</a
-		  > <a name="v::-45-" class="def"
+		  > <a href="" id="v::-45-" class="def"
 		  >:-</a
 		  > <a href=""
 		  >Foo</a
@@ -270,7 +270,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a name="v::-43-" class="def"
+	    > <a href="" id="v::-43-" class="def"
 	    >(:+)</a
 	    > ::   t -&gt; t -&gt; [t] <span class="fixity"
 	    >infixr 3</span
@@ -286,7 +286,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a name="t:-60--45--62-" class="def"
+	    > a <a href="" id="t:-60--45--62-" class="def"
 	    >&lt;-&gt;</a
 	    > b <span class="keyword"
 	    >where</span
@@ -305,7 +305,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v::-60--45--62-" class="def"
+		><a href="" id="v::-60--45--62-" class="def"
 		  >(:&lt;-&gt;)</a
 		  > ::  a -&gt; b -&gt; a <a href=""
 		  >&lt;-&gt;</a
@@ -324,7 +324,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > a <a name="t:-43--43-" class="def"
+	    > a <a href="" id="t:-43--43-" class="def"
 	    >++</a
 	    > b <span class="fixity"
 	    >infix 3</span
@@ -340,7 +340,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > a <a name="t:-42--42-" class="def"
+	    > a <a href="" id="t:-42--42-" class="def"
 	    >**</a
 	    > b <span class="fixity"
 	    >infix 9</span
@@ -356,7 +356,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > a <a name="t:-62--60--62-" class="def"
+	    > a <a href="" id="t:-62--60--62-" class="def"
 	    >&gt;&lt;&gt;</a
 	    > b <span class="keyword"
 	    >where</span
@@ -375,7 +375,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	    ><p class="src"
 	    ><span class="keyword"
 	      >type</span
-	      > a <a name="t:-60--62--60-" class="def"
+	      > a <a href="" id="t:-60--62--60-" class="def"
 	      >&lt;&gt;&lt;</a
 	      > b :: * <span class="fixity"
 	      >infixl 2</span
@@ -385,7 +385,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	    ><p class="src"
 	    ><span class="keyword"
 	      >data</span
-	      > a <a name="t:-62--60--60-" class="def"
+	      > a <a href="" id="t:-62--60--60-" class="def"
 	      >&gt;&lt;&lt;</a
 	      > b <span class="fixity"
 	      >infixl 3</span
@@ -397,9 +397,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a name="v:-62--62--60-" class="def"
+	    ><a href="" id="v:-62--62--60-" class="def"
 	      >(&gt;&gt;&lt;)</a
-	      >, <a name="v:-60--60--62-" class="def"
+	      >, <a href="" id="v:-60--60--62-" class="def"
 	      >(&lt;&lt;&gt;)</a
 	      > :: a -&gt; b -&gt; () <span class="fixity"
 	      >infixl 5 &lt;&lt;&gt;</span
@@ -409,13 +409,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	      ></span
 	      ></p
 	    ><p class="src"
-	    ><a name="v:-42--42--62-" class="def"
+	    ><a href="" id="v:-42--42--62-" class="def"
 	      >(**&gt;)</a
-	      >, <a name="v:-42--42--60-" class="def"
+	      >, <a href="" id="v:-42--42--60-" class="def"
 	      >(**&lt;)</a
-	      >, <a name="v:-62--42--42-" class="def"
+	      >, <a href="" id="v:-62--42--42-" class="def"
 	      >(&gt;**)</a
-	      >, <a name="v:-60--42--42-" class="def"
+	      >, <a href="" id="v:-60--42--42-" class="def"
 	      >(&lt;**)</a
 	      > :: a -&gt; a -&gt; () <span class="fixity"
 	      >infixr 8 **&gt;, &gt;**</span
@@ -434,7 +434,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >type</span
-	    > <a name="t:-62--45--60-" class="def"
+	    > <a href="" id="t:-62--45--60-" class="def"
 	    >(&gt;-&lt;)</a
 	    > a b = a <a href=""
 	    >&lt;-&gt;</a
@@ -454,7 +454,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/PatternSyns.html b/html-test/ref/PatternSyns.html
index 1027b714..6fe8fff0 100644
--- a/html-test/ref/PatternSyns.html
+++ b/html-test/ref/PatternSyns.html
@@ -116,7 +116,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:FooType" class="def"
+	    > <a href="" id="t:FooType" class="def"
 	    >FooType</a
 	    > x</p
 	  ><div class="doc"
@@ -129,7 +129,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:FooCtor" class="def"
+		><a href="" id="v:FooCtor" class="def"
 		  >FooCtor</a
 		  > x</td
 		><td class="doc empty"
@@ -142,7 +142,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a name="v:Foo" class="def"
+	    > <a href="" id="v:Foo" class="def"
 	    >Foo</a
 	    > ::   t -&gt; <a href=""
 	    >FooType</a
@@ -160,7 +160,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a name="v:Bar" class="def"
+	    > <a href="" id="v:Bar" class="def"
 	    >Bar</a
 	    > ::   t -&gt; <a href=""
 	    >FooType</a
@@ -180,7 +180,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a name="v::-60--45--62-" class="def"
+	    > <a href="" id="v::-60--45--62-" class="def"
 	    >(:&lt;-&gt;)</a
 	    > ::   t -&gt; t -&gt; (<a href=""
 	    >FooType</a
@@ -202,13 +202,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a name="t:-62--60-" class="def"
+	    > a <a href="" id="t:-62--60-" class="def"
 	    >&gt;&lt;</a
 	    > b</p
 	  ><div class="doc"
 	  ><p
 	    >Doc for (<code
-	      >&gt;&lt;</code
+	      ><a href=""
+		>&gt;&lt;</a
+		></code
 	      >)</p
 	    ></div
 	  ><div class="subs constructors"
@@ -217,7 +219,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:Empty" class="def"
+		><a href="" id="v:Empty" class="def"
 		  >Empty</a
 		  ></td
 		><td class="doc empty"
@@ -230,7 +232,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a name="v:E" class="def"
+	    > <a href="" id="v:E" class="def"
 	    >E</a
 	    > ::   <a href=""
 	    >(&gt;&lt;)</a
@@ -250,7 +252,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Properties.html b/html-test/ref/Properties.html
index 0e1d52ac..5d2e58c0 100644
--- a/html-test/ref/Properties.html
+++ b/html-test/ref/Properties.html
@@ -60,7 +60,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Properties.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:fib" class="def"
+	  ><a href="" id="v:fib" class="def"
 	    >fib</a
 	    > :: <a href=""
 	    >Integer</a
@@ -84,7 +84,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Properties.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/PruneWithWarning.html b/html-test/ref/PruneWithWarning.html
index 0662f31a..bbf21f42 100644
--- a/html-test/ref/PruneWithWarning.html
+++ b/html-test/ref/PruneWithWarning.html
@@ -63,7 +63,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_PruneWithWarning.html"
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/QuasiExpr.html b/html-test/ref/QuasiExpr.html
index eb0659b2..935a450f 100644
--- a/html-test/ref/QuasiExpr.html
+++ b/html-test/ref/QuasiExpr.html
@@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:Expr" class="def"
+	    > <a href="" id="t:Expr" class="def"
 	    >Expr</a
 	    ></p
 	  ><div class="subs constructors"
@@ -57,7 +57,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:IntExpr" class="def"
+		><a href="" id="v:IntExpr" class="def"
 		  >IntExpr</a
 		  > <a href=""
 		  >Integer</a
@@ -67,7 +67,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:AntiIntExpr" class="def"
+		><a href="" id="v:AntiIntExpr" class="def"
 		  >AntiIntExpr</a
 		  > <a href=""
 		  >String</a
@@ -77,7 +77,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:BinopExpr" class="def"
+		><a href="" id="v:BinopExpr" class="def"
 		  >BinopExpr</a
 		  > <a href=""
 		  >BinOp</a
@@ -91,7 +91,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:AntiExpr" class="def"
+		><a href="" id="v:AntiExpr" class="def"
 		  >AntiExpr</a
 		  > <a href=""
 		  >String</a
@@ -126,7 +126,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:BinOp" class="def"
+	    > <a href="" id="t:BinOp" class="def"
 	    >BinOp</a
 	    ></p
 	  ><div class="subs constructors"
@@ -135,7 +135,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:AddOp" class="def"
+		><a href="" id="v:AddOp" class="def"
 		  >AddOp</a
 		  ></td
 		><td class="doc empty"
@@ -143,7 +143,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:SubOp" class="def"
+		><a href="" id="v:SubOp" class="def"
 		  >SubOp</a
 		  ></td
 		><td class="doc empty"
@@ -151,7 +151,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:MulOp" class="def"
+		><a href="" id="v:MulOp" class="def"
 		  >MulOp</a
 		  ></td
 		><td class="doc empty"
@@ -159,7 +159,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:DivOp" class="def"
+		><a href="" id="v:DivOp" class="def"
 		  >DivOp</a
 		  ></td
 		><td class="doc empty"
@@ -190,7 +190,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:eval" class="def"
+	  ><a href="" id="v:eval" class="def"
 	    >eval</a
 	    > :: <a href=""
 	    >Expr</a
@@ -200,13 +200,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:expr" class="def"
+	  ><a href="" id="v:expr" class="def"
 	    >expr</a
 	    > :: QuasiQuoter</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:parseExprExp" class="def"
+	  ><a href="" id="v:parseExprExp" class="def"
 	    >parseExprExp</a
 	    > :: <a href=""
 	    >String</a
@@ -218,7 +218,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.1</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/QuasiQuote.html b/html-test/ref/QuasiQuote.html
index f96a7e67..610f5edf 100644
--- a/html-test/ref/QuasiQuote.html
+++ b/html-test/ref/QuasiQuote.html
@@ -46,7 +46,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiQuote.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:val" class="def"
+	  ><a href="" id="v:val" class="def"
 	    >val</a
 	    > :: <a href=""
 	    >Integer</a
@@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiQuote.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index 76576260..d0d0401e 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -74,7 +74,7 @@ Fix spurious superclass constraints bug.</pre
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:SomeType" class="def"
+	    > <a href="" id="t:SomeType" class="def"
 	    >SomeType</a
 	    > f a</p
 	  ><div class="subs instances"
@@ -118,7 +118,7 @@ Fix spurious superclass constraints bug.</pre
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.1</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/TH.html b/html-test/ref/TH.html
index 119d379c..e72c2189 100644
--- a/html-test/ref/TH.html
+++ b/html-test/ref/TH.html
@@ -46,7 +46,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TH.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:decl" class="def"
+	  ><a href="" id="v:decl" class="def"
 	    >decl</a
 	    > :: Q [Dec]</p
 	  ></div
@@ -56,7 +56,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TH.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/TH2.html b/html-test/ref/TH2.html
index 61145958..cf896bac 100644
--- a/html-test/ref/TH2.html
+++ b/html-test/ref/TH2.html
@@ -46,7 +46,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TH2.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f" class="def"
+	  ><a href="" id="v:f" class="def"
 	    >f</a
 	    > :: t -&gt; t</p
 	  ></div
@@ -56,7 +56,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TH2.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index 70257118..77599195 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -661,7 +661,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:T" class="def"
+	    > <a href="" id="t:T" class="def"
 	    >T</a
 	    > a b</p
 	  ><div class="doc"
@@ -677,7 +677,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:A" class="def"
+		><a href="" id="v:A" class="def"
 		  >A</a
 		  > <a href=""
 		  >Int</a
@@ -697,7 +697,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:B" class="def"
+		><a href="" id="v:B" class="def"
 		  >B</a
 		  > (<a href=""
 		  >T</a
@@ -724,7 +724,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:T2" class="def"
+	    > <a href="" id="t:T2" class="def"
 	    >T2</a
 	    > a b</p
 	  ><div class="doc"
@@ -736,7 +736,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:T3" class="def"
+	    > <a href="" id="t:T3" class="def"
 	    >T3</a
 	    > a b</p
 	  ><div class="doc"
@@ -749,7 +749,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:A1" class="def"
+		><a href="" id="v:A1" class="def"
 		  >A1</a
 		  > a</td
 		><td class="doc empty"
@@ -757,7 +757,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:B1" class="def"
+		><a href="" id="v:B1" class="def"
 		  >B1</a
 		  > b</td
 		><td class="doc empty"
@@ -770,7 +770,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:T4" class="def"
+	    > <a href="" id="t:T4" class="def"
 	    >T4</a
 	    > a b</p
 	  ><div class="subs constructors"
@@ -779,7 +779,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:A2" class="def"
+		><a href="" id="v:A2" class="def"
 		  >A2</a
 		  > a</td
 		><td class="doc empty"
@@ -787,7 +787,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:B2" class="def"
+		><a href="" id="v:B2" class="def"
 		  >B2</a
 		  > b</td
 		><td class="doc empty"
@@ -800,7 +800,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:T5" class="def"
+	    > <a href="" id="t:T5" class="def"
 	    >T5</a
 	    > a b</p
 	  ><div class="subs constructors"
@@ -809,7 +809,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:A3" class="def"
+		><a href="" id="v:A3" class="def"
 		  >A3</a
 		  > a</td
 		><td class="doc"
@@ -823,7 +823,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:B3" class="def"
+		><a href="" id="v:B3" class="def"
 		  >B3</a
 		  > b</td
 		><td class="doc"
@@ -842,7 +842,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:T6" class="def"
+	    > <a href="" id="t:T6" class="def"
 	    >T6</a
 	    ></p
 	  ><div class="doc"
@@ -855,7 +855,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:A4" class="def"
+		><a href="" id="v:A4" class="def"
 		  >A4</a
 		  ></td
 		><td class="doc"
@@ -869,7 +869,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:B4" class="def"
+		><a href="" id="v:B4" class="def"
 		  >B4</a
 		  ></td
 		><td class="doc"
@@ -883,7 +883,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:C4" class="def"
+		><a href="" id="v:C4" class="def"
 		  >C4</a
 		  ></td
 		><td class="doc"
@@ -902,7 +902,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a name="t:N1" class="def"
+	    > <a href="" id="t:N1" class="def"
 	    >N1</a
 	    > a</p
 	  ><div class="doc"
@@ -915,7 +915,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:N1" class="def"
+		><a href="" id="v:N1" class="def"
 		  >N1</a
 		  > a</td
 		><td class="doc empty"
@@ -928,7 +928,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a name="t:N2" class="def"
+	    > <a href="" id="t:N2" class="def"
 	    >N2</a
 	    > a b</p
 	  ><div class="doc"
@@ -941,7 +941,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:N2" class="def"
+		><a href="" id="v:N2" class="def"
 		  >N2</a
 		  ></td
 		><td class="doc empty"
@@ -952,16 +952,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:n" class="def"
-			>n</a
-			> :: a b</dt
-		      ><dd class="doc empty"
-		      >&nbsp;</dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:n" class="def"
+			  >n</a
+			  > :: a b</dfn
+			><div class="doc empty"
+			>&nbsp;</div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
@@ -972,7 +972,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a name="t:N3" class="def"
+	    > <a href="" id="t:N3" class="def"
 	    >N3</a
 	    > a b</p
 	  ><div class="doc"
@@ -985,7 +985,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:N3" class="def"
+		><a href="" id="v:N3" class="def"
 		  >N3</a
 		  ></td
 		><td class="doc empty"
@@ -996,22 +996,22 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:n3" class="def"
-			>n3</a
-			> :: a b</dt
-		      ><dd class="doc"
-		      ><p
-			>this is the <code
-			  ><a href=""
-			    >n3</a
-			    ></code
-			  > field</p
-			></dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:n3" class="def"
+			  >n3</a
+			  > :: a b</dfn
+			><div class="doc"
+			><p
+			  >this is the <code
+			    ><a href=""
+			      >n3</a
+			      ></code
+			    > field</p
+			  ></div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
@@ -1022,7 +1022,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:N4" class="def"
+	    > <a href="" id="t:N4" class="def"
 	    >N4</a
 	    > a b</p
 	  ><div class="doc"
@@ -1035,7 +1035,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a name="t:N5" class="def"
+	    > <a href="" id="t:N5" class="def"
 	    >N5</a
 	    > a b</p
 	  ><div class="subs constructors"
@@ -1044,7 +1044,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:N5" class="def"
+		><a href="" id="v:N5" class="def"
 		  >N5</a
 		  ></td
 		><td class="doc empty"
@@ -1055,18 +1055,18 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:n5" class="def"
-			>n5</a
-			> :: a b</dt
-		      ><dd class="doc"
-		      ><p
-			>no docs on the datatype or the constructor</p
-			></dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:n5" class="def"
+			  >n5</a
+			  > :: a b</dfn
+			><div class="doc"
+			><p
+			  >no docs on the datatype or the constructor</p
+			  ></div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
@@ -1077,7 +1077,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a name="t:N6" class="def"
+	    > <a href="" id="t:N6" class="def"
 	    >N6</a
 	    > a b</p
 	  ><div class="subs constructors"
@@ -1086,7 +1086,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:N6" class="def"
+		><a href="" id="v:N6" class="def"
 		  >N6</a
 		  ></td
 		><td class="doc"
@@ -1099,16 +1099,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:n6" class="def"
-			>n6</a
-			> :: a b</dt
-		      ><dd class="doc empty"
-		      >&nbsp;</dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:n6" class="def"
+			  >n6</a
+			  > :: a b</dfn
+			><div class="doc empty"
+			>&nbsp;</div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
@@ -1119,7 +1119,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a name="t:N7" class="def"
+	    > <a href="" id="t:N7" class="def"
 	    >N7</a
 	    > a b</p
 	  ><div class="doc"
@@ -1132,7 +1132,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:N7" class="def"
+		><a href="" id="v:N7" class="def"
 		  >N7</a
 		  ></td
 		><td class="doc"
@@ -1149,16 +1149,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:n7" class="def"
-			>n7</a
-			> :: a b</dt
-		      ><dd class="doc empty"
-		      >&nbsp;</dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:n7" class="def"
+			  >n7</a
+			  > :: a b</dfn
+			><div class="doc empty"
+			>&nbsp;</div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
@@ -1171,7 +1171,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:R" class="def"
+	    > <a href="" id="t:R" class="def"
 	    >R</a
 	    ></p
 	  ><div class="doc"
@@ -1205,7 +1205,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:C1" class="def"
+		><a href="" id="v:C1" class="def"
 		  >C1</a
 		  ></td
 		><td class="doc"
@@ -1222,64 +1222,68 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:p" class="def"
-			>p</a
-			> :: <a href=""
-			>Int</a
-			></dt
-		      ><dd class="doc"
-		      ><p
-			>This comment applies to the <code
-			  ><a href=""
-			    >p</a
-			    ></code
-			  > field</p
-			></dd
-		      ><dt class="src"
-		      ><a name="v:q" class="def"
-			>q</a
-			> :: <span class="keyword"
-			>forall</span
-			> a. a -&gt; a</dt
-		      ><dd class="doc"
-		      ><p
-			>This comment applies to the <code
-			  ><a href=""
-			    >q</a
-			    ></code
-			  > field</p
-			></dd
-		      ><dt class="src"
-		      ><a name="v:r" class="def"
-			>r</a
-			>, <a name="v:s" class="def"
-			>s</a
-			> :: <a href=""
-			>Int</a
-			></dt
-		      ><dd class="doc"
-		      ><p
-			>This comment applies to both <code
-			  ><a href=""
-			    >r</a
-			    ></code
-			  > and <code
-			  ><a href=""
-			    >s</a
-			    ></code
-			  ></p
-			></dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:p" class="def"
+			  >p</a
+			  > :: <a href=""
+			  >Int</a
+			  ></dfn
+			><div class="doc"
+			><p
+			  >This comment applies to the <code
+			    ><a href=""
+			      >p</a
+			      ></code
+			    > field</p
+			  ></div
+			></li
+		      ><li
+		      ><dfn class="src"
+			><a href="" id="v:q" class="def"
+			  >q</a
+			  > :: <span class="keyword"
+			  >forall</span
+			  > a. a -&gt; a</dfn
+			><div class="doc"
+			><p
+			  >This comment applies to the <code
+			    ><a href=""
+			      >q</a
+			      ></code
+			    > field</p
+			  ></div
+			></li
+		      ><li
+		      ><dfn class="src"
+			><a href="" id="v:r" class="def"
+			  >r</a
+			  >, <a href="" id="v:s" class="def"
+			  >s</a
+			  > :: <a href=""
+			  >Int</a
+			  ></dfn
+			><div class="doc"
+			><p
+			  >This comment applies to both <code
+			    ><a href=""
+			      >r</a
+			      ></code
+			    > and <code
+			    ><a href=""
+			      >s</a
+			      ></code
+			    ></p
+			  ></div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:C2" class="def"
+		><a href="" id="v:C2" class="def"
 		  >C2</a
 		  ></td
 		><td class="doc"
@@ -1296,46 +1300,48 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:t" class="def"
-			>t</a
-			> :: T1 -&gt; <a href=""
-			>T2</a
-			> <a href=""
-			>Int</a
-			> <a href=""
-			>Int</a
-			> -&gt; <a href=""
-			>T3</a
-			> <a href=""
-			>Bool</a
-			> <a href=""
-			>Bool</a
-			> -&gt; <a href=""
-			>T4</a
-			> <a href=""
-			>Float</a
-			> <a href=""
-			>Float</a
-			> -&gt; <a href=""
-			>T5</a
-			> () ()</dt
-		      ><dd class="doc empty"
-		      >&nbsp;</dd
-		      ><dt class="src"
-		      ><a name="v:u" class="def"
-			>u</a
-			>, <a name="v:v" class="def"
-			>v</a
-			> :: <a href=""
-			>Int</a
-			></dt
-		      ><dd class="doc empty"
-		      >&nbsp;</dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:t" class="def"
+			  >t</a
+			  > :: T1 -&gt; <a href=""
+			  >T2</a
+			  > <a href=""
+			  >Int</a
+			  > <a href=""
+			  >Int</a
+			  > -&gt; <a href=""
+			  >T3</a
+			  > <a href=""
+			  >Bool</a
+			  > <a href=""
+			  >Bool</a
+			  > -&gt; <a href=""
+			  >T4</a
+			  > <a href=""
+			  >Float</a
+			  > <a href=""
+			  >Float</a
+			  > -&gt; <a href=""
+			  >T5</a
+			  > () ()</dfn
+			><div class="doc empty"
+			>&nbsp;</div
+			></li
+		      ><li
+		      ><dfn class="src"
+			><a href="" id="v:u" class="def"
+			  >u</a
+			  >, <a href="" id="v:v" class="def"
+			  >v</a
+			  > :: <a href=""
+			  >Int</a
+			  ></dfn
+			><div class="doc empty"
+			>&nbsp;</div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
@@ -1346,7 +1352,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:R1" class="def"
+	    > <a href="" id="t:R1" class="def"
 	    >R1</a
 	    ></p
 	  ><div class="doc"
@@ -1359,7 +1365,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:C3" class="def"
+		><a href="" id="v:C3" class="def"
 		  >C3</a
 		  ></td
 		><td class="doc"
@@ -1376,52 +1382,56 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:s1" class="def"
-			>s1</a
-			> :: <a href=""
-			>Int</a
-			></dt
-		      ><dd class="doc"
-		      ><p
-			>The <code
-			  ><a href=""
-			    >s1</a
-			    ></code
-			  > record selector</p
-			></dd
-		      ><dt class="src"
-		      ><a name="v:s2" class="def"
-			>s2</a
-			> :: <a href=""
-			>Int</a
-			></dt
-		      ><dd class="doc"
-		      ><p
-			>The <code
-			  ><a href=""
-			    >s2</a
-			    ></code
-			  > record selector</p
-			></dd
-		      ><dt class="src"
-		      ><a name="v:s3" class="def"
-			>s3</a
-			> :: <a href=""
-			>Int</a
-			></dt
-		      ><dd class="doc"
-		      ><p
-			>The <code
-			  ><a href=""
-			    >s3</a
-			    ></code
-			  > record selector</p
-			></dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:s1" class="def"
+			  >s1</a
+			  > :: <a href=""
+			  >Int</a
+			  ></dfn
+			><div class="doc"
+			><p
+			  >The <code
+			    ><a href=""
+			      >s1</a
+			      ></code
+			    > record selector</p
+			  ></div
+			></li
+		      ><li
+		      ><dfn class="src"
+			><a href="" id="v:s2" class="def"
+			  >s2</a
+			  > :: <a href=""
+			  >Int</a
+			  ></dfn
+			><div class="doc"
+			><p
+			  >The <code
+			    ><a href=""
+			      >s2</a
+			      ></code
+			    > record selector</p
+			  ></div
+			></li
+		      ><li
+		      ><dfn class="src"
+			><a href="" id="v:s3" class="def"
+			  >s3</a
+			  > :: <a href=""
+			  >Int</a
+			  ></dfn
+			><div class="doc"
+			><p
+			  >The <code
+			    ><a href=""
+			      >s3</a
+			      ></code
+			    > record selector</p
+			  ></div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
@@ -1440,7 +1450,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    >class</span
 	    > <a href=""
 	    >D</a
-	    > a =&gt; <a name="t:C" class="def"
+	    > a =&gt; <a href="" id="t:C" class="def"
 	    >C</a
 	    > a <span class="keyword"
 	    >where</span
@@ -1459,7 +1469,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a name="v:a" class="def"
+	    ><a href="" id="v:a" class="def"
 	      >a</a
 	      > :: <a href=""
 	      >IO</a
@@ -1473,7 +1483,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		> method</p
 	      ></div
 	    ><p class="src"
-	    ><a name="v:b" class="def"
+	    ><a href="" id="v:b" class="def"
 	      >b</a
 	      > :: [a]</p
 	    ><div class="doc"
@@ -1490,7 +1500,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:D" class="def"
+	    > <a href="" id="t:D" class="def"
 	    >D</a
 	    > a <span class="keyword"
 	    >where</span
@@ -1503,13 +1513,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a name="v:d" class="def"
+	    ><a href="" id="v:d" class="def"
 	      >d</a
 	      > :: <a href=""
 	      >T</a
 	      > a b</p
 	    ><p class="src"
-	    ><a name="v:e" class="def"
+	    ><a href="" id="v:e" class="def"
 	      >e</a
 	      > :: (a, a)</p
 	    ></div
@@ -1550,7 +1560,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:E" class="def"
+	    > <a href="" id="t:E" class="def"
 	    >E</a
 	    > a</p
 	  ><div class="doc"
@@ -1568,7 +1578,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:F" class="def"
+	    > <a href="" id="t:F" class="def"
 	    >F</a
 	    > a <span class="keyword"
 	    >where</span
@@ -1577,7 +1587,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a name="v:ff" class="def"
+	    ><a href="" id="v:ff" class="def"
 	      >ff</a
 	      > :: a</p
 	    ></div
@@ -1590,7 +1600,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	>Function types</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f" class="def"
+	  ><a href="" id="v:f" class="def"
 	    >f</a
 	    > :: <a href=""
 	    >C</a
@@ -1652,7 +1662,7 @@ using double quotes: <a href=""
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:g" class="def"
+	  ><a href="" id="v:g" class="def"
 	    >g</a
 	    > :: <a href=""
 	    >Int</a
@@ -1761,7 +1771,7 @@ is at the beginning of the line).</pre
 	>A hidden module</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:hidden" class="def"
+	  ><a href="" id="v:hidden" class="def"
 	    >hidden</a
 	    > :: <a href=""
 	    >Int</a
@@ -1787,7 +1797,7 @@ is at the beginning of the line).</pre
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:Ex" class="def"
+	    > <a href="" id="t:Ex" class="def"
 	    >Ex</a
 	    > a</p
 	  ><div class="doc"
@@ -1804,7 +1814,7 @@ is at the beginning of the line).</pre
 		  >forall</span
 		  > b . <a href=""
 		  >C</a
-		  > b =&gt; <a name="v:Ex1" class="def"
+		  > b =&gt; <a href="" id="v:Ex1" class="def"
 		  >Ex1</a
 		  > b</td
 		><td class="doc empty"
@@ -1814,7 +1824,7 @@ is at the beginning of the line).</pre
 	      ><td class="src"
 		><span class="keyword"
 		  >forall</span
-		  > b . <a name="v:Ex2" class="def"
+		  > b . <a href="" id="v:Ex2" class="def"
 		  >Ex2</a
 		  > b</td
 		><td class="doc empty"
@@ -1826,7 +1836,7 @@ is at the beginning of the line).</pre
 		  >forall</span
 		  > b . <a href=""
 		  >C</a
-		  > a =&gt; <a name="v:Ex3" class="def"
+		  > a =&gt; <a href="" id="v:Ex3" class="def"
 		  >Ex3</a
 		  > b</td
 		><td class="doc empty"
@@ -1834,7 +1844,7 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:Ex4" class="def"
+		><a href="" id="v:Ex4" class="def"
 		  >Ex4</a
 		  > (<span class="keyword"
 		  >forall</span
@@ -1849,7 +1859,7 @@ is at the beginning of the line).</pre
 	>Type signatures with argument docs</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:k" class="def"
+	  ><a href="" id="v:k" class="def"
 	    >k</a
 	    ></p
 	  ><div class="subs arguments"
@@ -1937,7 +1947,7 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:l" class="def"
+	  ><a href="" id="v:l" class="def"
 	    >l</a
 	    ></p
 	  ><div class="subs arguments"
@@ -1977,7 +1987,7 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:m" class="def"
+	  ><a href="" id="v:m" class="def"
 	    >m</a
 	    ></p
 	  ><div class="subs arguments"
@@ -2023,7 +2033,7 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:o" class="def"
+	  ><a href="" id="v:o" class="def"
 	    >o</a
 	    ></p
 	  ><div class="subs arguments"
@@ -2073,7 +2083,7 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f-39-" class="def"
+	  ><a href="" id="v:f-39-" class="def"
 	    >f'</a
 	    > :: <a href=""
 	    >Int</a
@@ -2090,7 +2100,7 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:withType" class="def"
+	  ><a href="" id="v:withType" class="def"
 	    >withType</a
 	    > :: <a href=""
 	    >Int</a
@@ -2102,7 +2112,7 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:withoutType" class="def"
+	  ><a href="" id="v:withoutType" class="def"
 	    >withoutType</a
 	    > :: t</p
 	  ><div class="doc"
@@ -2116,7 +2126,7 @@ is at the beginning of the line).</pre
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.1</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Threaded.html b/html-test/ref/Threaded.html
index 95a18933..1f54b9ea 100644
--- a/html-test/ref/Threaded.html
+++ b/html-test/ref/Threaded.html
@@ -17,11 +17,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Threaded.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href="index.html"
+	><a href=""
 	  >Contents</a
 	  ></li
 	><li
-	><a href="doc-index.html"
+	><a href=""
 	  >Index</a
 	  ></li
 	></ul
@@ -56,9 +56,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Threaded.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href="#v:f"
+	  ><a href=""
 	    >f</a
-	    > :: <a href=" ${pkgroot}/../../share/doc/ghc/html/libraries/base-4.8.0.0/Prelude.html#t:Integer"
+	    > :: <a href=""
 	    >Integer</a
 	    ></li
 	  ></ul
@@ -68,9 +68,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Threaded.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f" class="def"
+	  ><a href="" id="v:f" class="def"
 	    >f</a
-	    > :: <a href=" ${pkgroot}/../../share/doc/ghc/html/libraries/base-4.8.0.0/Prelude.html#t:Integer"
+	    > :: <a href=""
 	    >Integer</a
 	    ></p
 	  ><div class="doc"
@@ -85,9 +85,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Threaded.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <a href="http://www.haskell.org/haddock/"
+      >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Ticket112.html b/html-test/ref/Ticket112.html
index 528787c7..4aefb488 100644
--- a/html-test/ref/Ticket112.html
+++ b/html-test/ref/Ticket112.html
@@ -56,7 +56,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f" class="def"
+	  ><a href="" id="v:f" class="def"
 	    >f</a
 	    > :: a</p
 	  ><div class="doc"
@@ -74,7 +74,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Ticket61.html b/html-test/ref/Ticket61.html
index addbbc98..aeb3c022 100644
--- a/html-test/ref/Ticket61.html
+++ b/html-test/ref/Ticket61.html
@@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket61.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:C" class="def"
+	    > <a href="" id="t:C" class="def"
 	    >C</a
 	    > a <span class="keyword"
 	    >where</span
@@ -57,7 +57,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket61.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a name="v:f" class="def"
+	    ><a href="" id="v:f" class="def"
 	      >f</a
 	      > :: a</p
 	    ><div class="doc"
@@ -72,7 +72,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket61.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Ticket75.html b/html-test/ref/Ticket75.html
index 7cb83583..169b0522 100644
--- a/html-test/ref/Ticket75.html
+++ b/html-test/ref/Ticket75.html
@@ -68,7 +68,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket75.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a name="t::-45-" class="def"
+	    > a <a href="" id="t::-45-" class="def"
 	    >:-</a
 	    > b</p
 	  ><div class="subs constructors"
@@ -77,7 +77,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket75.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:Q" class="def"
+		><a href="" id="v:Q" class="def"
 		  >Q</a
 		  ></td
 		><td class="doc empty"
@@ -88,7 +88,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket75.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f" class="def"
+	  ><a href="" id="v:f" class="def"
 	    >f</a
 	    > :: <a href=""
 	    >Int</a
@@ -108,7 +108,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket75.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/TitledPicture.html b/html-test/ref/TitledPicture.html
index be791898..3aac9689 100644
--- a/html-test/ref/TitledPicture.html
+++ b/html-test/ref/TitledPicture.html
@@ -64,7 +64,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TitledPicture.html");}
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:foo" class="def"
+	  ><a href="" id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href=""
 	    >Integer</a
@@ -81,7 +81,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TitledPicture.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:bar" class="def"
+	  ><a href="" id="v:bar" class="def"
 	    >bar</a
 	    > :: <a href=""
 	    >Integer</a
@@ -102,7 +102,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TitledPicture.html");}
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index a8456b6b..5dfa3b5e 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -162,7 +162,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:X" class="def"
+	    > <a href="" id="t:X" class="def"
 	    >X</a
 	    ></p
 	  ><div class="doc"
@@ -175,7 +175,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:X" class="def"
+		><a href="" id="v:X" class="def"
 		  >X</a
 		  ></td
 		><td class="doc"
@@ -185,7 +185,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:XX" class="def"
+		><a href="" id="v:XX" class="def"
 		  >XX</a
 		  ></td
 		><td class="doc"
@@ -195,7 +195,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:XXX" class="def"
+		><a href="" id="v:XXX" class="def"
 		  >XXX</a
 		  ></td
 		><td class="doc"
@@ -281,7 +281,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		      >AssocD</a
 		      > * <a href=""
 		      >X</a
-		      > = <a name="v:AssocX" class="def"
+		      > = <a href="" id="v:AssocX" class="def"
 		      >AssocX</a
 		      ></span
 		    ></td
@@ -317,23 +317,23 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		      >X</a
 		      > <ul class="inst"
 		      ><li class="inst"
-			>= <a name="v:BatX" class="def"
+			>= <a href="" id="v:BatX" class="def"
 			  >BatX</a
 			  > <a href=""
 			  >X</a
 			  ></li
 			><li class="inst"
-			>| <a name="v:BatXX" class="def"
+			>| <a href="" id="v:BatXX" class="def"
 			  >BatXX</a
 			  > { <ul class="subs"
 			  ><li
-			    ><a name="v:aaa" class="def"
+			    ><a href="" id="v:aaa" class="def"
 			      >aaa</a
 			      > :: <a href=""
 			      >X</a
 			      ></li
 			    ><li
-			    ><a name="v:bbb" class="def"
+			    ><a href="" id="v:bbb" class="def"
 			      >bbb</a
 			      > :: <a href=""
 			      >Y</a
@@ -410,7 +410,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:Y" class="def"
+	    > <a href="" id="t:Y" class="def"
 	    >Y</a
 	    ></p
 	  ><div class="doc"
@@ -473,7 +473,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		      >AssocD</a
 		      > * <a href=""
 		      >Y</a
-		      > = <a name="v:AssocY" class="def"
+		      > = <a href="" id="v:AssocY" class="def"
 		      >AssocY</a
 		      ></span
 		    ></td
@@ -507,7 +507,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		      >Bat</a
 		      > * <a href=""
 		      >Y</a
-		      > = <a name="v:BatY" class="def"
+		      > = <a href="" id="v:BatY" class="def"
 		      >BatY</a
 		      > <a href=""
 		      >Y</a
@@ -558,7 +558,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:Z" class="def"
+	    > <a href="" id="t:Z" class="def"
 	    >Z</a
 	    ></p
 	  ><div class="doc"
@@ -571,7 +571,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:ZA" class="def"
+		><a href="" id="v:ZA" class="def"
 		  >ZA</a
 		  ></td
 		><td class="doc empty"
@@ -579,7 +579,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a name="v:ZB" class="def"
+		><a href="" id="v:ZB" class="def"
 		  >ZB</a
 		  ></td
 		><td class="doc empty"
@@ -605,7 +605,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		      >where</span
 		      ><ul class="inst"
 		      ><li class="inst"
-			><a name="v:BatZ1" class="def"
+			><a href="" id="v:BatZ1" class="def"
 			  >BatZ1</a
 			  > ::  <a href=""
 			  >Z</a
@@ -617,17 +617,17 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 			  >ZA</a
 			  ></li
 			><li class="inst"
-			><a name="v:BatZ2" class="def"
+			><a href="" id="v:BatZ2" class="def"
 			  >BatZ2</a
 			  > :: { <ul class="subs"
 			  ><li
-			    ><a name="v:batx" class="def"
+			    ><a href="" id="v:batx" class="def"
 			      >batx</a
 			      > :: <a href=""
 			      >X</a
 			      ></li
 			    ><li
-			    ><a name="v:baty" class="def"
+			    ><a href="" id="v:baty" class="def"
 			      >baty</a
 			      > :: <a href=""
 			      >Y</a
@@ -656,7 +656,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:Test" class="def"
+	    > <a href="" id="t:Test" class="def"
 	    >Test</a
 	    > a</p
 	  ><div class="doc"
@@ -704,7 +704,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > <a name="t:Foo" class="def"
+	    > <a href="" id="t:Foo" class="def"
 	    >Foo</a
 	    > a :: k</p
 	  ><div class="doc"
@@ -760,7 +760,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a name="t:Bat" class="def"
+	    > <a href="" id="t:Bat" class="def"
 	    >Bat</a
 	    > a :: *</p
 	  ><div class="doc"
@@ -785,7 +785,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		      >where</span
 		      ><ul class="inst"
 		      ><li class="inst"
-			><a name="v:BatZ1" class="def"
+			><a href="" id="v:BatZ1" class="def"
 			  >BatZ1</a
 			  > ::  <a href=""
 			  >Z</a
@@ -797,17 +797,17 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 			  >ZA</a
 			  ></li
 			><li class="inst"
-			><a name="v:BatZ2" class="def"
+			><a href="" id="v:BatZ2" class="def"
 			  >BatZ2</a
 			  > :: { <ul class="subs"
 			  ><li
-			    ><a name="v:batx" class="def"
+			    ><a href="" id="v:batx" class="def"
 			      >batx</a
 			      > :: <a href=""
 			      >X</a
 			      ></li
 			    ><li
-			    ><a name="v:baty" class="def"
+			    ><a href="" id="v:baty" class="def"
 			      >baty</a
 			      > :: <a href=""
 			      >Y</a
@@ -837,7 +837,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		      >Bat</a
 		      > * <a href=""
 		      >Y</a
-		      > = <a name="v:BatY" class="def"
+		      > = <a href="" id="v:BatY" class="def"
 		      >BatY</a
 		      > <a href=""
 		      >Y</a
@@ -859,23 +859,23 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		      >X</a
 		      > <ul class="inst"
 		      ><li class="inst"
-			>= <a name="v:BatX" class="def"
+			>= <a href="" id="v:BatX" class="def"
 			  >BatX</a
 			  > <a href=""
 			  >X</a
 			  ></li
 			><li class="inst"
-			>| <a name="v:BatXX" class="def"
+			>| <a href="" id="v:BatXX" class="def"
 			  >BatXX</a
 			  > { <ul class="subs"
 			  ><li
-			    ><a name="v:aaa" class="def"
+			    ><a href="" id="v:aaa" class="def"
 			      >aaa</a
 			      > :: <a href=""
 			      >X</a
 			      ></li
 			    ><li
-			    ><a name="v:bbb" class="def"
+			    ><a href="" id="v:bbb" class="def"
 			      >bbb</a
 			      > :: <a href=""
 			      >Y</a
@@ -898,7 +898,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a name="t:Assoc" class="def"
+	    > <a href="" id="t:Assoc" class="def"
 	    >Assoc</a
 	    > a</p
 	  ><div class="doc"
@@ -911,7 +911,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	    ><p class="src"
 	    ><span class="keyword"
 	      >data</span
-	      > <a name="t:AssocD" class="def"
+	      > <a href="" id="t:AssocD" class="def"
 	      >AssocD</a
 	      > a :: *</p
 	    ><div class="doc"
@@ -921,7 +921,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	    ><p class="src"
 	    ><span class="keyword"
 	      >type</span
-	      > <a name="t:AssocT" class="def"
+	      > <a href="" id="t:AssocT" class="def"
 	      >AssocT</a
 	      > a :: *</p
 	    ><div class="doc"
@@ -970,7 +970,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > <a name="t:Bar" class="def"
+	    > <a href="" id="t:Bar" class="def"
 	    >Bar</a
 	    > b</p
 	  ><div class="doc"
@@ -1010,7 +1010,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > a <a name="t:-60--62-" class="def"
+	    > a <a href="" id="t:-60--62-" class="def"
 	    >&lt;&gt;</a
 	    > b :: k</p
 	  ><div class="subs instances"
@@ -1076,7 +1076,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > a <a name="t:-62--60-" class="def"
+	    > a <a href="" id="t:-62--60-" class="def"
 	    >&gt;&lt;</a
 	    > b</p
 	  ><div class="subs instances"
@@ -1110,7 +1110,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.1</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/TypeFamilies2.html b/html-test/ref/TypeFamilies2.html
index e71cdcb8..0c7e4ec6 100644
--- a/html-test/ref/TypeFamilies2.html
+++ b/html-test/ref/TypeFamilies2.html
@@ -72,7 +72,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:W" class="def"
+	    > <a href="" id="t:W" class="def"
 	    >W</a
 	    ></p
 	  ><div class="doc"
@@ -93,7 +93,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
 		      >Bar</a
 		      > <a href=""
 		      >W</a
-		      > = <a name="v:BarX" class="def"
+		      > = <a href="" id="v:BarX" class="def"
 		      >BarX</a
 		      > Z</span
 		    ></td
@@ -126,7 +126,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > <a name="t:Foo" class="def"
+	    > <a href="" id="t:Foo" class="def"
 	    >Foo</a
 	    > a</p
 	  ><div class="doc"
@@ -180,7 +180,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a name="t:Bar" class="def"
+	    > <a href="" id="t:Bar" class="def"
 	    >Bar</a
 	    > a</p
 	  ><div class="doc"
@@ -201,7 +201,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
 		      >Bar</a
 		      > <a href=""
 		      >W</a
-		      > = <a name="v:BarX" class="def"
+		      > = <a href="" id="v:BarX" class="def"
 		      >BarX</a
 		      > Z</span
 		    ></td
@@ -234,7 +234,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.16.1</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/TypeOperators.html b/html-test/ref/TypeOperators.html
index 3aa5a037..283083be 100644
--- a/html-test/ref/TypeOperators.html
+++ b/html-test/ref/TypeOperators.html
@@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a name="t::-45-:" class="def"
+	    > a <a href="" id="t::-45-:" class="def"
 	    >:-:</a
 	    > b</p
 	  ></div
@@ -56,7 +56,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > (a <a name="t::-43-:" class="def"
+	    > (a <a href="" id="t::-43-:" class="def"
 	    >:+:</a
 	    > b) c</p
 	  ></div
@@ -64,7 +64,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a name="t:Op" class="def"
+	    > <a href="" id="t:Op" class="def"
 	    >Op</a
 	    > a b</p
 	  ></div
@@ -72,7 +72,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a name="t:O" class="def"
+	    > <a href="" id="t:O" class="def"
 	    >O</a
 	    > g f a</p
 	  ><div class="subs constructors"
@@ -81,7 +81,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a name="v:O" class="def"
+		><a href="" id="v:O" class="def"
 		  >O</a
 		  ></td
 		><td class="doc empty"
@@ -92,16 +92,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 		><div class="subs fields"
 		  ><p class="caption"
 		    >Fields</p
-		    ><dl
-		    ><dt class="src"
-		      ><a name="v:unO" class="def"
-			>unO</a
-			> :: g (f a)</dt
-		      ><dd class="doc empty"
-		      >&nbsp;</dd
-		      ></dl
-		    ><div class="clear"
-		    ></div
+		    ><ul
+		    ><li
+		      ><dfn class="src"
+			><a href="" id="v:unO" class="def"
+			  >unO</a
+			  > :: g (f a)</dfn
+			><div class="doc empty"
+			>&nbsp;</div
+			></li
+		      ></ul
 		    ></div
 		  ></td
 		></tr
@@ -112,13 +112,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > a <a name="t:-60--61--62-" class="def"
+	    > a <a href="" id="t:-60--61--62-" class="def"
 	    >&lt;=&gt;</a
 	    > b</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:biO" class="def"
+	  ><a href="" id="v:biO" class="def"
 	    >biO</a
 	    > :: (g <a href=""
 	    >`O`</a
@@ -126,19 +126,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:f" class="def"
+	  ><a href="" id="v:f" class="def"
 	    >f</a
 	    > :: (a ~ b) =&gt; a -&gt; b</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:g" class="def"
+	  ><a href="" id="v:g" class="def"
 	    >g</a
 	    > :: (a ~ b, b ~ c) =&gt; a -&gt; c</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:x" class="def"
+	  ><a href="" id="v:x" class="def"
 	    >x</a
 	    > :: (a <a href=""
 	    >:-:</a
@@ -150,7 +150,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a name="v:y" class="def"
+	  ><a href="" id="v:y" class="def"
 	    >y</a
 	    > :: (a <a href=""
 	    >&lt;=&gt;</a
@@ -166,7 +166,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Unicode.html b/html-test/ref/Unicode.html
index 968d8506..d724ecd7 100644
--- a/html-test/ref/Unicode.html
+++ b/html-test/ref/Unicode.html
@@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Unicode.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:x" class="def"
+	  ><a href="" id="v:x" class="def"
 	    >x</a
 	    > :: <a href=""
 	    >Int</a
@@ -74,7 +74,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Unicode.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/Visible.html b/html-test/ref/Visible.html
index 3e76564b..54a04e86 100644
--- a/html-test/ref/Visible.html
+++ b/html-test/ref/Visible.html
@@ -46,7 +46,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Visible.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a name="v:visible" class="def"
+	  ><a href="" id="v:visible" class="def"
 	    >visible</a
 	    > :: <a href=""
 	    >Int</a
@@ -60,7 +60,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Visible.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.15.0</p
+	> version 2.16.2</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/haddock-util.js b/html-test/ref/haddock-util.js
index ba574356..fc7743fe 100644
--- a/html-test/ref/haddock-util.js
+++ b/html-test/ref/haddock-util.js
@@ -229,7 +229,7 @@ function perform_search(full)
 }
 
 function setSynopsis(filename) {
-    if (parent.window.synopsis) {
+    if (parent.window.synopsis && parent.window.synopsis.location) {
         if (parent.window.synopsis.location.replace) {
             // In Firefox this avoids adding the change to the history.
             parent.window.synopsis.location.replace(filename);
diff --git a/html-test/ref/mini_FunArgs.html b/html-test/ref/mini_FunArgs.html
index 89729720..eac6c8fe 100644
--- a/html-test/ref/mini_FunArgs.html
+++ b/html-test/ref/mini_FunArgs.html
@@ -31,6 +31,24 @@ window.onload = function () {pageLoad();};
 	  >g</a
 	  ></p
 	></div
+      ><div class="top"
+      ><p class="src"
+	><a href="" target="main"
+	  >h</a
+	  ></p
+	></div
+      ><div class="top"
+      ><p class="src"
+	><a href="" target="main"
+	  >i</a
+	  ></p
+	></div
+      ><div class="top"
+      ><p class="src"
+	><a href="" target="main"
+	  >j</a
+	  ></p
+	></div
       ></div
     ></body
   ></html
diff --git a/html-test/ref/ocean.css b/html-test/ref/ocean.css
index 1110b407..9ad9f9d2 100644
--- a/html-test/ref/ocean.css
+++ b/html-test/ref/ocean.css
@@ -41,6 +41,9 @@ a[href]:link { color: rgb(196,69,29); }
 a[href]:visited { color: rgb(171,105,84); }
 a[href]:hover { text-decoration:underline; }
 
+a[href].def:link, a[href].def:visited { color: black; }
+a[href].def:hover { color: rgb(78, 98, 114); }
+
 /* @end */
 
 /* @group Fonts & Sizes */
@@ -424,30 +427,31 @@ div#style-menu-holder {
   visibility: hidden;
 }
 
-.subs dl {
+.subs ul {
+  list-style: none;
+  display: table;
   margin: 0;
 }
 
-.subs dt {
-  float: left;
-  clear: left;
-  display: block;
+.subs ul li {
+  display: table-row;
+}
+
+.subs ul li dfn {
+  display: table-cell;
+  font-style: normal;
+  font-weight: bold;
   margin: 1px 0;
+  white-space: nowrap;
 }
 
-.subs dd {
-  float: right;
-  width: 90%;
-  display: block;
+.subs ul li > .doc {
+  display: table-cell;
   padding-left: 0.5em;
   margin-bottom: 0.5em;
 }
 
-.subs dd.empty {
-  display: none;
-}
-
-.subs dd p {
+.subs ul li > .doc p {
   margin: 0;
 }
 
-- 
cgit v1.2.3