Merge branch 'fix-up-testsuite'

99 files changed, 6987 insertions, 3273 deletions

diff --git a/haddock-api/haddock-api.cabal b/haddock-api/haddock-api.cabal
index e1e7480f..50ebca0b 100644
--- a/haddock-api/haddock-api.cabal
+++ b/haddock-api/haddock-api.cabal
@@ -49,10 +49,10 @@ library
     , xhtml >= 3000.2 && < 3000.3
     , Cabal >= 1.10
     , ghc-boot
-    , ghc >= 7.10 && < 7.12
+    , ghc >= 8.0 && < 8.2
 
     , ghc-paths
-    , haddock-library == 1.2.*
+    , haddock-library == 1.4.*
 
   hs-source-dirs:
       src
@@ -115,9 +115,9 @@ test-suite spec
     Haddock.Backends.Hyperlinker.ParserSpec
 
   build-depends:
-      base >= 4.3 && < 4.9
+      base
     , containers
-    , ghc >= 7.10 && < 7.12
+    , ghc
     , hspec
     , QuickCheck == 2.*
 
diff --git a/haddock-test/haddock-test.cabal b/haddock-test/haddock-test.cabal
index 0394da8f..2b75ea81 100644
--- a/haddock-test/haddock-test.cabal
+++ b/haddock-test/haddock-test.cabal
@@ -16,7 +16,7 @@ library
   default-language: Haskell2010
   ghc-options: -Wall
   hs-source-dirs:   src
-  build-depends:    base, directory, process, filepath, Cabal, xml, xhtml, syb
+  build-depends:    base, bytestring, directory, process, filepath, Cabal, xml, xhtml, syb
 
   exposed-modules:
     Test.Haddock
diff --git a/haddock-test/src/Test/Haddock.hs b/haddock-test/src/Test/Haddock.hs
index e8a0ac8e..6041c77c 100644
--- a/haddock-test/src/Test/Haddock.hs
+++ b/haddock-test/src/Test/Haddock.hs
@@ -16,6 +16,7 @@ import System.Exit
 import System.FilePath
 import System.IO
 import System.Process
+import qualified Data.ByteString.Char8 as BS
 
 import Test.Haddock.Config
 import Test.Haddock.Process
@@ -95,8 +96,8 @@ checkFile cfg file = do
     hasRef <- doesFileExist $ refFile dcfg file
     if hasRef
         then do
-            mout <- ccfgRead ccfg file <$> readFile (outFile dcfg file)
-            mref <- ccfgRead ccfg file <$> readFile (refFile dcfg file)
+            mout <- readOut cfg file
+            mref <- readRef cfg file
             return $ case (mout, mref) of
                 (Just out, Just ref)
                     | ccfgEqual ccfg out ref -> Pass
@@ -107,11 +108,34 @@ checkFile cfg file = do
     ccfg = cfgCheckConfig cfg
     dcfg = cfgDirConfig cfg
 
+-- We use ByteString here to ensure that no lazy I/O is performed.
+-- This way to ensure that the reference file isn't held open in
+-- case after `diffFile` (which is problematic if we need to rewrite
+-- the reference file in `maybeAcceptFile`)
+
+-- | Read the reference artifact for a test
+readRef :: Config c -> FilePath -> IO (Maybe c)
+readRef cfg file =
+    ccfgRead ccfg . BS.unpack
+    <$> BS.readFile (refFile dcfg file)
+  where
+    ccfg = cfgCheckConfig cfg
+    dcfg = cfgDirConfig cfg
+
+-- | Read (and clean) the test output artifact for a test
+readOut :: Config c -> FilePath -> IO (Maybe c)
+readOut cfg file =
+    fmap (ccfgClean ccfg file) . ccfgRead ccfg . BS.unpack
+    <$> BS.readFile (outFile dcfg file)
+  where
+    ccfg = cfgCheckConfig cfg
+    dcfg = cfgDirConfig cfg
+
 
 diffFile :: Config c -> FilePath -> FilePath -> IO ()
 diffFile cfg diff file = do
-    Just out <- ccfgRead ccfg file <$> readFile (outFile dcfg file)
-    Just ref <- ccfgRead ccfg file <$> readFile (refFile dcfg file)
+    Just out <- readOut cfg file
+    Just ref <- readRef cfg file
     writeFile outFile' $ ccfgDump ccfg out
     writeFile refFile' $ ccfgDump ccfg ref
 
@@ -130,10 +154,14 @@ diffFile cfg diff file = do
 
 
 maybeAcceptFile :: Config c -> FilePath -> CheckResult -> IO CheckResult
-maybeAcceptFile cfg@(Config { cfgDirConfig = dcfg }) file result
+maybeAcceptFile cfg file result
     | cfgAccept cfg && result `elem` [NoRef, Fail] = do
-        copyFile' (outFile dcfg file) (refFile dcfg file)
+        Just out <- readOut cfg file
+        writeFile (refFile dcfg file) $ ccfgDump ccfg out
         pure Accepted
+  where
+    dcfg = cfgDirConfig cfg
+    ccfg = cfgCheckConfig cfg
 maybeAcceptFile _ _ result = pure result
 
 
diff --git a/haddock-test/src/Test/Haddock/Config.hs b/haddock-test/src/Test/Haddock/Config.hs
index cd878178..dea101d8 100644
--- a/haddock-test/src/Test/Haddock/Config.hs
+++ b/haddock-test/src/Test/Haddock/Config.hs
@@ -42,7 +42,11 @@ data TestPackage = TestPackage
 
 
 data CheckConfig c = CheckConfig
-    { ccfgRead :: String -> String -> Maybe c
+    { ccfgRead :: String -> Maybe c
+      -- ^ @f contents@ parses file contents @contents@ to
+      -- produce a thing to be compared.
+    , ccfgClean :: String -> c -> c
+      -- ^ @f fname x@ cleans @x@ to such that it can be compared
     , ccfgDump :: c -> String
     , ccfgEqual :: c -> c -> Bool
     }
diff --git a/haddock.cabal b/haddock.cabal
index 1d7a9fee..11bf3861 100644
--- a/haddock.cabal
+++ b/haddock.cabal
@@ -123,7 +123,7 @@ executable haddock
       Haddock.Syb
       Haddock.Convert
   else
-    build-depends:  haddock-api == 2.16.*
+    build-depends:  haddock-api == 2.17.*
 
 test-suite driver-test
   type:             exitcode-stdio-1.0
diff --git a/hoogle-test/Main.hs b/hoogle-test/Main.hs
index c8cda640..59a98fd0 100644
--- a/hoogle-test/Main.hs
+++ b/hoogle-test/Main.hs
@@ -9,7 +9,8 @@ import Test.Haddock
 
 checkConfig :: CheckConfig String
 checkConfig = CheckConfig
-    { ccfgRead = \_ input -> Just input
+    { ccfgRead = Just
+    , ccfgClean = \_ -> id
     , ccfgDump = id
     , ccfgEqual = (==)
     }
diff --git a/html-test/Main.hs b/html-test/Main.hs
index 3880fc3c..67dbeec6 100755
--- a/html-test/Main.hs
+++ b/html-test/Main.hs
@@ -2,6 +2,7 @@
 
 
 import Data.Char
+import Data.Function (on)
 
 import System.Environment
 import System.FilePath
@@ -12,9 +13,10 @@ import Test.Haddock.Xhtml
 
 checkConfig :: CheckConfig Xml
 checkConfig = CheckConfig
-    { ccfgRead = \mdl input -> stripIfRequired mdl <$> parseXml input
+    { ccfgRead = parseXml
+    , ccfgClean = stripIfRequired
     , ccfgDump = dumpXml
-    , ccfgEqual = (==)
+    , ccfgEqual = (==) `on` dumpXml
     }
 
 
diff --git a/html-test/ref/A.html b/html-test/ref/A.html
index 56c04bc6..73534dc7 100644
--- a/html-test/ref/A.html
+++ b/html-test/ref/A.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >A</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_A.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,35 +49,35 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >A</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >A</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >other</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >test2</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Bool</a
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >X</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >X</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >reExport</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ></ul
@@ -88,7 +89,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:A" class="def"
+	    > <a href="#" id="t:A" class="def"
 	    >A</a
 	    ></p
 	  ><div class="subs constructors"
@@ -97,28 +98,28 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:A" class="def"
+		><a href="#" id="v:A" class="def"
 		  >A</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:other" class="def"
+	  ><a href="#" id="v:other" class="def"
 	    >other</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:test2" class="def"
+	  ><a href="#" id="v:test2" class="def"
 	    >test2</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Bool</a
 	    ></p
 	  ><div class="doc"
@@ -130,7 +131,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:X" class="def"
+	    > <a href="#" id="t:X" class="def"
 	    >X</a
 	    ></p
 	  ><div class="doc"
@@ -143,7 +144,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:X" class="def"
+		><a href="#" id="v:X" class="def"
 		  >X</a
 		  ></td
 		><td class="doc"
@@ -156,9 +157,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:reExport" class="def"
+	  ><a href="#" id="v:reExport" class="def"
 	    >reExport</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -169,11 +170,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/B.html b/html-test/ref/B.html
index 6176cbeb..cc8f9eef 100644
--- a/html-test/ref/B.html
+++ b/html-test/ref/B.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >B</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_B.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,27 +47,27 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  >module <a href=""
+	  >module <a href="#"
 	    >A</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >test</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >reExport</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >X</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >X</a
 	    ></li
 	  ></ul
@@ -76,15 +77,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  >module <a href=""
+	  >module <a href="#"
 	    >A</a
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:test" class="def"
+	  ><a href="#" id="v:test" class="def"
 	    >test</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -93,36 +94,36 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
 	      >other</code
 	      >.
    These links should work: <code
-	      ><a href=""
+	      ><a href="#"
 		>other</a
 		></code
 	      >, <code
-	      ><a href=""
+	      ><a href="#"
 		>sortBy</a
 		></code
 	      >, <code
-	      ><a href=""
+	      ><a href="#"
 		>test2</a
 		></code
 	      >, <code
-	      ><a href=""
+	      ><a href="#"
 		>test2</a
 		></code
 	      >, <code
-	      ><a href=""
+	      ><a href="#"
 		>fromMaybe</a
 		></code
 	      >.
-   Module link: <a href=""
+   Module link: <a href="#"
 	      >Prelude</a
 	      >.</p
 	    ></div
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:reExport" class="def"
+	  ><a href="#" id="v:reExport" class="def"
 	    >reExport</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -134,7 +135,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:X" class="def"
+	    > <a href="#" id="t:X" class="def"
 	    >X</a
 	    ></p
 	  ><div class="doc"
@@ -147,7 +148,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:X" class="def"
+		><a href="#" id="v:X" class="def"
 		  >X</a
 		  ></td
 		><td class="doc"
@@ -161,11 +162,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_B.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bold.html b/html-test/ref/Bold.html
index 904d2239..c1f304fd 100644
--- a/html-test/ref/Bold.html
+++ b/html-test/ref/Bold.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bold</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bold.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bold.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,9 +47,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bold.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >foo</a
-	    > :: t</li
+	    > :: a</li
 	  ></ul
 	></div
       ><div id="interface"
@@ -56,9 +57,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bold.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
-	    > :: t</p
+	    > :: a</p
 	  ><div class="doc"
 	  ><p
 	    >Some <strong
@@ -89,11 +90,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bold.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug1.html b/html-test/ref/Bug1.html
index 28de3c64..ad864e78 100644
--- a/html-test/ref/Bug1.html
+++ b/html-test/ref/Bug1.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug1</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug1.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,9 +49,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >T</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >T</a
 	    ></li
 	  ></ul
@@ -62,14 +63,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:T" class="def"
+	    > <a href="#" id="t:T" class="def"
 	    >T</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >We should have different anchors for constructors and types/classes.  This
  hyperlink should point to the type constructor by default: <code
-	      ><a href=""
+	      ><a href="#"
 		>T</a
 		></code
 	      >.</p
@@ -80,11 +81,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:T" class="def"
+		><a href="#" id="v:T" class="def"
 		  >T</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -92,11 +93,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug1.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug195.html b/html-test/ref/Bug195.html
index 39816f32..c81cfbb4 100644
--- a/html-test/ref/Bug195.html
+++ b/html-test/ref/Bug195.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug195</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug195.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,7 +49,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:T" class="def"
+	    > <a href="#" id="t:T" class="def"
 	    >T</a
 	    ></p
 	  ><div class="subs constructors"
@@ -57,11 +58,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:A" class="def"
+		><a href="#" id="v:A" class="def"
 		  >A</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td colspan="2"
@@ -71,7 +72,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:someField" class="def"
+			><a href="#" id="v:someField" class="def"
 			  >someField</a
 			  > :: ()</dfn
 			><div class="doc"
@@ -81,7 +82,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="" id="v:someOtherField" class="def"
+			><a href="#" id="v:someOtherField" class="def"
 			  >someOtherField</a
 			  > :: ()</dfn
 			><div class="doc"
@@ -95,11 +96,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:B" class="def"
+		><a href="#" id="v:B" class="def"
 		  >B</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td colspan="2"
@@ -109,7 +110,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:someField" class="def"
+			><a href="#" id="v:someField" class="def"
 			  >someField</a
 			  > :: ()</dfn
 			><div class="doc"
@@ -119,7 +120,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="" id="v:someOtherField" class="def"
+			><a href="#" id="v:someOtherField" class="def"
 			  >someOtherField</a
 			  > :: ()</dfn
 			><div class="doc"
@@ -133,11 +134,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:C" class="def"
+		><a href="#" id="v:C" class="def"
 		  >C</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td colspan="2"
@@ -147,7 +148,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:someField" class="def"
+			><a href="#" id="v:someField" class="def"
 			  >someField</a
 			  > :: ()</dfn
 			><div class="doc"
@@ -157,7 +158,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="" id="v:someOtherField" class="def"
+			><a href="#" id="v:someOtherField" class="def"
 			  >someOtherField</a
 			  > :: ()</dfn
 			><div class="doc"
@@ -175,11 +176,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug195.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug2.html b/html-test/ref/Bug2.html
index c28fb609..1b7f50ff 100644
--- a/html-test/ref/Bug2.html
+++ b/html-test/ref/Bug2.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug2</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug2.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug2.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,20 +47,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug2.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:x" class="def"
+	  ><a href="#" id="v:x" class="def"
 	    >x</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >A</a
 	    ></p
 	  ></div
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug201.html b/html-test/ref/Bug201.html
index 58bed8e8..06d8ec96 100644
--- a/html-test/ref/Bug201.html
+++ b/html-test/ref/Bug201.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug201</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug201.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug201.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,11 +47,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug201.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >f</a
 	    > :: ()</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >g</a
 	    > :: ()</li
 	  ></ul
@@ -60,7 +61,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug201.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:f" class="def"
+	  ><a href="#" id="v:f" class="def"
 	    >f</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -72,7 +73,7 @@ should be dropped
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:g" class="def"
+	  ><a href="#" id="v:g" class="def"
 	    >g</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -92,11 +93,7 @@ because there's a space before closing @
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug253.html b/html-test/ref/Bug253.html
index d8e49bd4..2d78880b 100644
--- a/html-test/ref/Bug253.html
+++ b/html-test/ref/Bug253.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug253</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug253.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug253.html&quot;);};
+//
 </script
     ></head
   ><body
   ><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
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -62,7 +63,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug253.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href="#v:foo"
+	  ><a href="#"
 	    >foo</a
 	    > :: ()</li
 	  ></ul
@@ -72,7 +73,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug253.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#v:foo" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -80,7 +81,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug253.html");};
 	    >This link should generate <code
 	      >#v</code
 	      > anchor: <code
-	      ><a href="DoesNotExist.html#v:fakeFakeFake"
+	      ><a href="#"
 		>fakeFakeFake</a
 		></code
 	      ></p
@@ -89,11 +90,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug253.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href="http://www.haskell.org/haddock/"
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug26.html b/html-test/ref/Bug26.html
index bdb51231..6537e30b 100644
--- a/html-test/ref/Bug26.html
+++ b/html-test/ref/Bug26.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug26</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug26.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug26.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -58,26 +59,22 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug26.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >f</a
 	    > :: ()</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >g</a
 	    > :: ()</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href=""
+	    > <a href="#"
 	    >C</a
 	    > a <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
-	    ><li
-	      ><a href=""
-		>c_f</a
-		> :: a</li
-	      ></ul
+	    ></ul
 	    ></li
 	  ></ul
 	></div
@@ -86,7 +83,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug26.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:f" class="def"
+	  ><a href="#" id="v:f" class="def"
 	    >f</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -100,7 +97,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug26.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:g" class="def"
+	  ><a href="#" id="v:g" class="def"
 	    >g</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -112,7 +109,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug26.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:C" class="def"
+	    > <a href="#" id="t:C" class="def"
 	    >C</a
 	    > a <span class="keyword"
 	    >where</span
@@ -125,11 +122,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug26.html");};
 	      >Since: 1.0</em
 	      ></p
 	    ></div
+	  ><div class="subs minimal"
+	  ><p class="caption"
+	    >Minimal complete definition</p
+	    ><p class="src"
+	    ><a href="#"
+	      >c_f</a
+	      ></p
+	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="" id="v:c_f" class="def"
+	    ><a href="#" id="v:c_f" class="def"
 	      >c_f</a
 	      > :: a</p
 	    ><div class="doc"
@@ -149,7 +154,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug26.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:ic:C:C:1" class="instance expander" onclick="toggleSection('i:ic:C:C:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >C</a
 		      > ()</span
 		    ></td
@@ -169,7 +174,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug26.html");};
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >c_f</a
 			  > :: ()</p
 			></div
@@ -183,11 +188,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug26.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug294.html b/html-test/ref/Bug294.html
index 59171bd6..8c0f2837 100644
--- a/html-test/ref/Bug294.html
+++ b/html-test/ref/Bug294.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug294</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug294.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,7 +49,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:A" class="def"
+	    > <a href="#" id="t:A" class="def"
 	    >A</a
 	    ></p
 	  ><div class="subs instances"
@@ -61,34 +62,34 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >data</span
-		      > <a href=""
+		      > <a href="#"
 		      >DP</a
-		      > <a href=""
+		      > <a href="#"
 		      >A</a
-		      > = <a href="" id="v:ProblemCtor-39-" class="def"
+		      > = <a href="#" id="v:ProblemCtor-39-" class="def"
 		      >ProblemCtor'</a
-		      > <a href=""
+		      > <a href="#"
 		      >A</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >data</span
-		      > TP <a href=""
+		      > TP <a href="#"
 		      >A</a
-		      > = <a href="" id="v:ProblemCtor" class="def"
+		      > = <a href="#" id="v:ProblemCtor" class="def"
 		      >ProblemCtor</a
-		      > <a href=""
+		      > <a href="#"
 		      >A</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		></table
 	      ></div
@@ -96,31 +97,31 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:problemField" class="def"
+	  ><a href="#" id="v:problemField" class="def"
 	    >problemField</a
-	    > :: TO <a href=""
+	    > :: TO <a href="#"
 	    >A</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >A</a
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:problemField-39-" class="def"
+	  ><a href="#" id="v:problemField-39-" class="def"
 	    >problemField'</a
-	    > :: DO <a href=""
+	    > :: DO <a href="#"
 	    >A</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >A</a
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:gadtField" class="def"
+	  ><a href="#" id="v:gadtField" class="def"
 	    >gadtField</a
-	    > :: GADT <a href=""
+	    > :: ({..} -&gt; GADT <a href="#"
 	    >A</a
-	    > -&gt; <a href=""
+	    >) -&gt; <a href="#"
 	    >A</a
 	    ></p
 	  ></div
@@ -128,9 +129,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a href="" id="t:DP" class="def"
+	    > <a href="#" id="t:DP" class="def"
 	    >DP</a
-	    > t :: *</p
+	    > t :: <a href="#"
+	    >*</a
+	    ></p
 	  ><div class="subs instances"
 	  ><p id="control.i:DP" class="caption collapser" onclick="toggleSection('i:DP')"
 	    >Instances</p
@@ -141,18 +144,18 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >data</span
-		      > <a href=""
+		      > <a href="#"
 		      >DP</a
-		      > <a href=""
+		      > <a href="#"
 		      >A</a
-		      > = <a href="" id="v:ProblemCtor-39-" class="def"
+		      > = <a href="#" id="v:ProblemCtor-39-" class="def"
 		      >ProblemCtor'</a
-		      > <a href=""
+		      > <a href="#"
 		      >A</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		></table
 	      ></div
@@ -161,11 +164,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug294.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug298.html b/html-test/ref/Bug298.html
index 9e52da5e..6ce24bdb 100644
--- a/html-test/ref/Bug298.html
+++ b/html-test/ref/Bug298.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug298</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug298.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug298.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,23 +47,23 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug298.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >(&lt;^&gt;)</a
 	    > :: (a -&gt; a) -&gt; a -&gt; a</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >(&lt;^)</a
 	    > :: a -&gt; a -&gt; a</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >(^&gt;)</a
 	    > :: a -&gt; a -&gt; a</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >(&#8902;^)</a
 	    > :: a -&gt; a -&gt; a</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >f</a
 	    > :: ()</li
 	  ></ul
@@ -72,49 +73,49 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug298.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="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 href="" id="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 href="" id="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 href="" id="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 href="" id="v:f" class="def"
+	  ><a href="#" id="v:f" class="def"
 	    >f</a
 	    > :: ()</p
 	  ><div class="doc"
 	  ><p
 	    >Links to <code
-	      ><a href=""
+	      ><a href="#"
 		>&lt;^&gt;</a
 		></code
 	      > and <code
-	      ><a href=""
+	      ><a href="#"
 		>^&gt;</a
 		></code
 	      >, <code
-	      ><a href=""
+	      ><a href="#"
 		>&lt;^</a
 		></code
 	      > and <code
-	      ><a href=""
+	      ><a href="#"
 		>&#8902;^</a
 		></code
 	      >.</p
@@ -123,11 +124,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug298.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug3.html b/html-test/ref/Bug3.html
index 70e799be..d5287df4 100644
--- a/html-test/ref/Bug3.html
+++ b/html-test/ref/Bug3.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug3</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug3.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug3.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,9 +47,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug3.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ></ul
@@ -58,9 +59,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug3.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -72,11 +73,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug3.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug308.html b/html-test/ref/Bug308.html
index 23761bec..6113fdeb 100644
--- a/html-test/ref/Bug308.html
+++ b/html-test/ref/Bug308.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug308</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug308.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug308.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,11 +47,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug308.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >f</a
 	    > :: ()</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >g</a
 	    > :: ()</li
 	  ></ul
@@ -60,7 +61,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug308.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:f" class="def"
+	  ><a href="#" id="v:f" class="def"
 	    >f</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -76,24 +77,24 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug308.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:g" class="def"
+	  ><a href="#" id="v:g" class="def"
 	    >g</a
 	    > :: ()</p
 	  ><div class="doc"
 	  ><p
-	    >start <a href=""
+	    >start <a href="#"
 	      >Bug308</a
 	      ></p
 	    ><p
-	    >startOldStyle <a href=""
+	    >startOldStyle <a href="#"
 	      >Bug308</a
 	      ></p
 	    ><p
-	    >middle <a href=""
+	    >middle <a href="#"
 	      >Bug308</a
 	      ></p
 	    ><p
-	    >end <a href=""
+	    >end <a href="#"
 	      >Bug308</a
 	      ></p
 	    ></div
@@ -101,11 +102,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug308.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug308CrossModule.html b/html-test/ref/Bug308CrossModule.html
index fea4c4a5..cf935c85 100644
--- a/html-test/ref/Bug308CrossModule.html
+++ b/html-test/ref/Bug308CrossModule.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug308CrossModule</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug308CrossModule.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug308CrossModule.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,7 +47,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug308CrossModule.html
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >h</a
 	    > :: ()</li
 	  ></ul
@@ -56,24 +57,24 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug308CrossModule.html
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:h" class="def"
+	  ><a href="#" id="v:h" class="def"
 	    >h</a
 	    > :: ()</p
 	  ><div class="doc"
 	  ><p
-	    >start <a href=""
+	    >start <a href="#"
 	      >Bug308</a
 	      ></p
 	    ><p
-	    >startOldStyle <a href=""
+	    >startOldStyle <a href="#"
 	      >Bug308</a
 	      ></p
 	    ><p
-	    >middle <a href=""
+	    >middle <a href="#"
 	      >Bug308</a
 	      ></p
 	    ><p
-	    >end <a href=""
+	    >end <a href="#"
 	      >Bug308</a
 	      ></p
 	    ></div
@@ -81,11 +82,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug308CrossModule.html
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug310.html b/html-test/ref/Bug310.html
index 62717c76..7ba62e68 100644
--- a/html-test/ref/Bug310.html
+++ b/html-test/ref/Bug310.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug310</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug310.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug310.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,9 +49,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug310.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >type family</span
-	    > a <a href=""
+	    > a <a href="#"
 	    >+</a
-	    > b :: <a href=""
+	    > b :: <a href="#"
 	    >Nat</a
 	    ></li
 	  ></ul
@@ -62,9 +63,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug310.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > a <a href="" id="t:-43-" class="def"
+	    > a <a href="#" id="t:-43-" class="def"
 	    >+</a
-	    > b :: <a href=""
+	    > b :: <a href="#"
 	    >Nat</a
 	    > <span class="fixity"
 	    >infixl 6</span
@@ -79,11 +80,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug310.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug313.html b/html-test/ref/Bug313.html
index 5477cf2c..b2857202 100644
--- a/html-test/ref/Bug313.html
+++ b/html-test/ref/Bug313.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug313</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug313.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug313.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -49,7 +50,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug313.html");};
 	  >The first list is incorrectly numbered as 1. 2. 1.; the second example
  renders fine (1. 2. 3.).</p
 	  ><p
-	  >See <a href=""
+	  >See <a href="#"
 	    >https://github.com/haskell/haddock/issues/313</a
 	    ></p
 	  ></div
@@ -59,11 +60,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug313.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >a</a
 	    > :: a</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >b</a
 	    > :: a</li
 	  ></ul
@@ -73,7 +74,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug313.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:a" class="def"
+	  ><a href="#" id="v:a" class="def"
 	    >a</a
 	    > :: a</p
 	  ><div class="doc"
@@ -97,7 +98,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug313.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:b" class="def"
+	  ><a href="#" id="v:b" class="def"
 	    >b</a
 	    > :: a</p
 	  ><div class="doc"
@@ -122,11 +123,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug313.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug335.html b/html-test/ref/Bug335.html
index 6b3dc613..c8f5bed9 100644
--- a/html-test/ref/Bug335.html
+++ b/html-test/ref/Bug335.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug335</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug335.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug335.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,11 +47,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug335.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >f</a
 	    > :: ()</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >g</a
 	    > :: ()</li
 	  ></ul
@@ -60,7 +61,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug335.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:f" class="def"
+	  ><a href="#" id="v:f" class="def"
 	    >f</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -74,7 +75,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug335.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:g" class="def"
+	  ><a href="#" id="v:g" class="def"
 	    >g</a
 	    > :: ()</p
 	  ><div class="doc"
@@ -115,11 +116,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug335.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug387.html b/html-test/ref/Bug387.html
index 80735916..0fdfd723 100644
--- a/html-test/ref/Bug387.html
+++ b/html-test/ref/Bug387.html
@@ -1,34 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug387</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
     ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug387.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug387.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,11 +47,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug387.html");};
 	>Contents</p
 	><ul
 	><li
-	  ><a href=""
+	  ><a href="#"
 	    >Section1</a
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >Section2</a
 	    ></li
 	  ></ul
@@ -62,15 +61,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug387.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >test1</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >test2</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ></ul
@@ -82,9 +81,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug387.html");};
 	  ></h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:test1" class="def"
+	  ><a href="#" id="v:test1" class="def"
 	    >test1</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ></div
@@ -94,20 +93,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug387.html");};
 	  ></h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:test2" class="def"
+	  ><a href="#" id="v:test2" class="def"
 	    >test2</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ></div
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug4.html b/html-test/ref/Bug4.html
index f1fab937..d109a20b 100644
--- a/html-test/ref/Bug4.html
+++ b/html-test/ref/Bug4.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug4</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug4.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug4.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,9 +47,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug4.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ></ul
@@ -58,9 +59,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug4.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -71,11 +72,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug4.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug6.html b/html-test/ref/Bug6.html
index 407a031c..335a16d0 100644
--- a/html-test/ref/Bug6.html
+++ b/html-test/ref/Bug6.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug6</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug6.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -56,25 +57,25 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >A</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >A</a
-	    > <a href=""
+	    > <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >B</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >B</a
 	    > {<ul class="subs"
 	    ><li
-	      ><a href=""
+	      ><a href="#"
 		>b</a
-		> :: <a href=""
+		> :: <a href="#"
 		>Int</a
 		></li
 	      ></ul
@@ -82,21 +83,21 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >C</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >C</a
 	    > {<ul class="subs"
 	    ><li
-	      ><a href=""
+	      ><a href="#"
 		>c1</a
-		> :: <a href=""
+		> :: <a href="#"
 		>Int</a
 		></li
 	      ><li
-	      ><a href=""
+	      ><a href="#"
 		>c2</a
-		> :: <a href=""
+		> :: <a href="#"
 		>Int</a
 		></li
 	      ></ul
@@ -104,23 +105,23 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >D</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >D</a
-	    > <a href=""
+	    > <a href="#"
 	    >Int</a
-	    > <a href=""
+	    > <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href=""
+	    > <a href="#"
 	    >E</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >E</a
-	    > <a href=""
+	    > <a href="#"
 	    >Int</a
 	    ></li
 	  ></ul
@@ -132,7 +133,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:A" class="def"
+	    > <a href="#" id="t:A" class="def"
 	    >A</a
 	    ></p
 	  ><div class="doc"
@@ -145,13 +146,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:A" class="def"
+		><a href="#" id="v:A" class="def"
 		  >A</a
-		  > <a href=""
+		  > <a href="#"
 		  >Int</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -160,7 +161,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:B" class="def"
+	    > <a href="#" id="t:B" class="def"
 	    >B</a
 	    ></p
 	  ><div class="doc"
@@ -174,11 +175,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:B" class="def"
+		><a href="#" id="v:B" class="def"
 		  >B</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td colspan="2"
@@ -188,13 +189,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:b" class="def"
+			><a href="#" id="v:b" class="def"
 			  >b</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Int</a
 			  ></dfn
 			><div class="doc empty"
-			>&nbsp;</div
+			></div
 			></li
 		      ></ul
 		    ></div
@@ -207,7 +208,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:C" class="def"
+	    > <a href="#" id="t:C" class="def"
 	    >C</a
 	    ></p
 	  ><div class="doc"
@@ -220,11 +221,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:C" class="def"
+		><a href="#" id="v:C" class="def"
 		  >C</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td colspan="2"
@@ -234,23 +235,23 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:c1" class="def"
+			><a href="#" id="v:c1" class="def"
 			  >c1</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Int</a
 			  ></dfn
 			><div class="doc empty"
-			>&nbsp;</div
+			></div
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="" id="v:c2" class="def"
+			><a href="#" id="v:c2" class="def"
 			  >c2</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Int</a
 			  ></dfn
 			><div class="doc empty"
-			>&nbsp;</div
+			></div
 			></li
 		      ></ul
 		    ></div
@@ -263,7 +264,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:D" class="def"
+	    > <a href="#" id="t:D" class="def"
 	    >D</a
 	    ></p
 	  ><div class="doc"
@@ -277,15 +278,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:D" class="def"
+		><a href="#" id="v:D" class="def"
 		  >D</a
-		  > <a href=""
+		  > <a href="#"
 		  >Int</a
-		  > <a href=""
+		  > <a href="#"
 		  >Int</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -294,7 +295,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="" id="t:E" class="def"
+	    > <a href="#" id="t:E" class="def"
 	    >E</a
 	    ></p
 	  ><div class="doc"
@@ -307,13 +308,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:E" class="def"
+		><a href="#" id="v:E" class="def"
 		  >E</a
-		  > <a href=""
+		  > <a href="#"
 		  >Int</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -321,11 +322,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug6.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug7.html b/html-test/ref/Bug7.html
index f3bd4db6..4578c771 100644
--- a/html-test/ref/Bug7.html
+++ b/html-test/ref/Bug7.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug7</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug7.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -57,15 +58,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >Foo</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >Foo</a
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href=""
+	    > <a href="#"
 	    >Bar</a
 	    > x y</li
 	  ></ul
@@ -77,7 +78,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Foo" class="def"
+	    > <a href="#" id="t:Foo" class="def"
 	    >Foo</a
 	    ></p
 	  ><div class="doc"
@@ -90,11 +91,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:Foo" class="def"
+		><a href="#" id="v:Foo" class="def"
 		  >Foo</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -108,11 +109,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:id:Foo:Bar:1" class="instance expander" onclick="toggleSection('i:id:Foo:Bar:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Bar</a
-		      > <a href=""
+		      > <a href="#"
 		      >Foo</a
-		      > <a href=""
+		      > <a href="#"
 		      >Foo</a
 		      ></span
 		    ></td
@@ -135,7 +136,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:Bar" class="def"
+	    > <a href="#" id="t:Bar" class="def"
 	    >Bar</a
 	    > x y</p
 	  ><div class="doc"
@@ -152,11 +153,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:ic:Bar:Bar:1" class="instance expander" onclick="toggleSection('i:ic:Bar:Bar:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Bar</a
-		      > <a href=""
+		      > <a href="#"
 		      >Foo</a
-		      > <a href=""
+		      > <a href="#"
 		      >Foo</a
 		      ></span
 		    ></td
@@ -178,11 +179,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug7.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html
index 6f0bc654..3b91dfc7 100644
--- a/html-test/ref/Bug8.html
+++ b/html-test/ref/Bug8.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug8</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug8.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,7 +49,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Typ" class="def"
+	    > <a href="#" id="t:Typ" class="def"
 	    >Typ</a
 	    ></p
 	  ><div class="subs constructors"
@@ -57,36 +58,36 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:Type" class="def"
+		><a href="#" id="v:Type" class="def"
 		  >Type</a
-		  > (<a href=""
+		  > (<a href="#"
 		  >Typ</a
-		  >, [<a href=""
+		  >, [<a href="#"
 		  >Typ</a
 		  >])</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:TFree" class="def"
+		><a href="#" id="v:TFree" class="def"
 		  >TFree</a
-		  > (<a href=""
+		  > (<a href="#"
 		  >Typ</a
-		  >, [<a href=""
+		  >, [<a href="#"
 		  >Typ</a
 		  >])</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:-45--45--62-" class="def"
+	  ><a href="#" id="v:-45--45--62-" class="def"
 	    >(--&gt;)</a
-	    > :: t -&gt; t1 -&gt; <a href=""
+	    > :: t -&gt; t1 -&gt; <a href="#"
 	    >Typ</a
 	    > <span class="fixity"
 	    >infix 9</span
@@ -96,13 +97,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:-45--45--45--62-" class="def"
+	  ><a href="#" id="v:-45--45--45--62-" class="def"
 	    >(---&gt;)</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Foldable</a
-	    > t0 =&gt; t0 t -&gt; <a href=""
+	    > t0 =&gt; t0 t -&gt; <a href="#"
 	    >Typ</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >Typ</a
 	    > <span class="fixity"
 	    >infix 9</span
@@ -112,30 +113,26 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:s" class="def"
+	  ><a href="#" id="v:s" class="def"
 	    >s</a
-	    > :: t</p
+	    > :: a</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:t" class="def"
+	  ><a href="#" id="v:t" class="def"
 	    >t</a
-	    > :: t</p
+	    > :: a</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:main" class="def"
+	  ><a href="#" id="v:main" class="def"
 	    >main</a
-	    > :: t</p
+	    > :: a</p
 	  ></div
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bug85.html b/html-test/ref/Bug85.html
index e1f0431f..4e52ad65 100644
--- a/html-test/ref/Bug85.html
+++ b/html-test/ref/Bug85.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bug85</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bug85.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug85.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,9 +49,17 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug85.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Foo" class="def"
+	    > <a href="#" id="t:Foo" class="def"
 	    >Foo</a
-	    > :: (* -&gt; *) -&gt; * -&gt; * <span class="keyword"
+	    > :: (<a href="#"
+	    >*</a
+	    > -&gt; <a href="#"
+	    >*</a
+	    >) -&gt; <a href="#"
+	    >*</a
+	    > -&gt; <a href="#"
+	    >*</a
+	    > <span class="keyword"
 	    >where</span
 	    ></p
 	  ><div class="subs constructors"
@@ -59,13 +68,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug85.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:Bar" class="def"
+		><a href="#" id="v:Bar" class="def"
 		  >Bar</a
-		  > ::  f x -&gt; <a href=""
+		  > :: f x -&gt; <a href="#"
 		  >Foo</a
 		  > f (f x)</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -74,9 +83,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug85.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Baz" class="def"
+	    > <a href="#" id="t:Baz" class="def"
 	    >Baz</a
-	    > :: * <span class="keyword"
+	    > :: <a href="#"
+	    >*</a
+	    > <span class="keyword"
 	    >where</span
 	    ></p
 	  ><div class="subs constructors"
@@ -85,13 +96,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug85.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:Baz-39-" class="def"
+		><a href="#" id="v:Baz-39-" class="def"
 		  >Baz'</a
-		  > ::  <a href=""
+		  > :: <a href="#"
 		  >Baz</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -100,7 +111,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug85.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Qux" class="def"
+	    > <a href="#" id="t:Qux" class="def"
 	    >Qux</a
 	    > <span class="keyword"
 	    >where</span
@@ -111,13 +122,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug85.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:Quux" class="def"
+		><a href="#" id="v:Quux" class="def"
 		  >Quux</a
-		  > ::  <a href=""
+		  > :: <a href="#"
 		  >Qux</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -125,11 +136,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug85.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/BugDeprecated.html b/html-test/ref/BugDeprecated.html
index 28cf89be..38f8e00e 100644
--- a/html-test/ref/BugDeprecated.html
+++ b/html-test/ref/BugDeprecated.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >BugDeprecated</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_BugDeprecated.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,39 +47,39 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >bar</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >baz</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >one</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >two</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >three</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ></ul
@@ -88,9 +89,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -102,9 +103,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:bar" class="def"
+	  ><a href="#" id="v:bar" class="def"
 	    >bar</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -116,9 +117,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:baz" class="def"
+	  ><a href="#" id="v:baz" class="def"
 	    >baz</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -130,9 +131,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:one" class="def"
+	  ><a href="#" id="v:one" class="def"
 	    >one</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -146,9 +147,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:two" class="def"
+	  ><a href="#" id="v:two" class="def"
 	    >two</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -160,9 +161,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:three" class="def"
+	  ><a href="#" id="v:three" class="def"
 	    >three</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -175,11 +176,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugDeprecated.html");}
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/BugExportHeadings.html b/html-test/ref/BugExportHeadings.html
index d6ae0359..970f8200 100644
--- a/html-test/ref/BugExportHeadings.html
+++ b/html-test/ref/BugExportHeadings.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >BugExportHeadings</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_BugExportHeadings.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,27 +47,27 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
 	>Contents</p
 	><ul
 	><li
-	  ><a href=""
+	  ><a href="#"
 	    >Foo</a
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >Bar</a
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >Baz</a
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >One</a
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >Two</a
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >Three</a
 	    ></li
 	  ></ul
@@ -76,39 +77,39 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >bar</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >baz</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >one</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >two</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >three</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ></ul
@@ -118,9 +119,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
 	>Foo</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ></div
@@ -128,9 +129,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
 	>Bar</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:bar" class="def"
+	  ><a href="#" id="v:bar" class="def"
 	    >bar</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ></div
@@ -138,9 +139,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
 	>Baz</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:baz" class="def"
+	  ><a href="#" id="v:baz" class="def"
 	    >baz</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ></div
@@ -148,9 +149,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
 	>One</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:one" class="def"
+	  ><a href="#" id="v:one" class="def"
 	    >one</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -164,9 +165,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
 	>Two</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:two" class="def"
+	  ><a href="#" id="v:two" class="def"
 	    >two</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -180,9 +181,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
 	>Three</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:three" class="def"
+	  ><a href="#" id="v:three" class="def"
 	    >three</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -195,11 +196,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_BugExportHeadings.html
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bugs.html b/html-test/ref/Bugs.html
index 78807f43..6082a9b8 100644
--- a/html-test/ref/Bugs.html
+++ b/html-test/ref/Bugs.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Bugs</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Bugs.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bugs.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,7 +49,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bugs.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:A" class="def"
+	    > <a href="#" id="t:A" class="def"
 	    >A</a
 	    > a</p
 	  ><div class="subs constructors"
@@ -57,13 +58,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bugs.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:A" class="def"
+		><a href="#" id="v:A" class="def"
 		  >A</a
-		  > a (a -&gt; <a href=""
+		  > a (a -&gt; <a href="#"
 		  >Int</a
 		  >)</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -71,11 +72,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bugs.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedClass.html b/html-test/ref/DeprecatedClass.html
index 7bf4b41c..0c7449dc 100644
--- a/html-test/ref/DeprecatedClass.html
+++ b/html-test/ref/DeprecatedClass.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >DeprecatedClass</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedClass.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,30 +49,22 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html")
 	><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href=""
+	    > <a href="#"
 	    >SomeClass</a
 	    > a <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
-	    ><li
-	      ><a href=""
-		>foo</a
-		> :: a -&gt; a</li
-	      ></ul
+	    ></ul
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href=""
+	    > <a href="#"
 	    >SomeOtherClass</a
 	    > a <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
-	    ><li
-	      ><a href=""
-		>bar</a
-		> :: a -&gt; a</li
-	      ></ul
+	    ></ul
 	    ></li
 	  ></ul
 	></div
@@ -82,7 +75,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html")
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:SomeClass" class="def"
+	    > <a href="#" id="t:SomeClass" class="def"
 	    >SomeClass</a
 	    > a <span class="keyword"
 	    >where</span
@@ -95,11 +88,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html")
 	    ><p
 	    >some class</p
 	    ></div
+	  ><div class="subs minimal"
+	  ><p class="caption"
+	    >Minimal complete definition</p
+	    ><p class="src"
+	    ><a href="#"
+	      >foo</a
+	      ></p
+	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="" id="v:foo" class="def"
+	    ><a href="#" id="v:foo" class="def"
 	      >foo</a
 	      > :: a -&gt; a</p
 	    ><div class="doc"
@@ -116,7 +117,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html")
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:SomeOtherClass" class="def"
+	    > <a href="#" id="t:SomeOtherClass" class="def"
 	    >SomeOtherClass</a
 	    > a <span class="keyword"
 	    >where</span
@@ -127,11 +128,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html")
 	      >Deprecated: SomeOtherClass</p
 	      ></div
 	    ></div
+	  ><div class="subs minimal"
+	  ><p class="caption"
+	    >Minimal complete definition</p
+	    ><p class="src"
+	    ><a href="#"
+	      >bar</a
+	      ></p
+	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="" id="v:bar" class="def"
+	    ><a href="#" id="v:bar" class="def"
 	      >bar</a
 	      > :: a -&gt; a</p
 	    ><div class="doc"
@@ -145,11 +154,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedClass.html")
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedData.html b/html-test/ref/DeprecatedData.html
index 0a90e110..2029bb89 100644
--- a/html-test/ref/DeprecatedData.html
+++ b/html-test/ref/DeprecatedData.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >DeprecatedData</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedData.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,15 +49,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >Foo</a
 	    ><ul class="subs"
 	    ><li
-	      >= <a href=""
+	      >= <a href="#"
 		>Foo</a
 		></li
 	      ><li
-	      >| <a href=""
+	      >| <a href="#"
 		>Bar</a
 		></li
 	      ></ul
@@ -64,15 +65,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >One</a
 	    ><ul class="subs"
 	    ><li
-	      >= <a href=""
+	      >= <a href="#"
 		>One</a
 		></li
 	      ><li
-	      >| <a href=""
+	      >| <a href="#"
 		>Two</a
 		></li
 	      ></ul
@@ -86,7 +87,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Foo" class="def"
+	    > <a href="#" id="t:Foo" class="def"
 	    >Foo</a
 	    ></p
 	  ><div class="doc"
@@ -103,7 +104,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:Foo" class="def"
+		><a href="#" id="v:Foo" class="def"
 		  >Foo</a
 		  ></td
 		><td class="doc"
@@ -117,7 +118,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:Bar" class="def"
+		><a href="#" id="v:Bar" class="def"
 		  >Bar</a
 		  ></td
 		><td class="doc"
@@ -136,7 +137,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:One" class="def"
+	    > <a href="#" id="t:One" class="def"
 	    >One</a
 	    ></p
 	  ><div class="doc"
@@ -151,7 +152,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:One" class="def"
+		><a href="#" id="v:One" class="def"
 		  >One</a
 		  ></td
 		><td class="doc"
@@ -163,7 +164,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:Two" class="def"
+		><a href="#" id="v:Two" class="def"
 		  >Two</a
 		  ></td
 		><td class="doc"
@@ -179,11 +180,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedData.html");
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedFunction.html b/html-test/ref/DeprecatedFunction.html
index b015bc95..e3ecec8d 100644
--- a/html-test/ref/DeprecatedFunction.html
+++ b/html-test/ref/DeprecatedFunction.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >DeprecatedFunction</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedFunction.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,15 +47,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction.htm
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >bar</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ></ul
@@ -64,16 +65,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction.htm
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
 	    ><p
 	      >Deprecated: use <code
-		><a href=""
+		><a href="#"
 		  >bar</a
 		  ></code
 		> instead</p
@@ -84,9 +85,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction.htm
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:bar" class="def"
+	  ><a href="#" id="v:bar" class="def"
 	    >bar</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -97,11 +98,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction.htm
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedFunction2.html b/html-test/ref/DeprecatedFunction2.html
index 46a509ee..10676eef 100644
--- a/html-test/ref/DeprecatedFunction2.html
+++ b/html-test/ref/DeprecatedFunction2.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >DeprecatedFunction2</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction2.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedFunction2.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,9 +47,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction2.ht
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ></ul
@@ -58,9 +59,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction2.ht
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -73,11 +74,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction2.ht
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedFunction3.html b/html-test/ref/DeprecatedFunction3.html
index 1749d024..c5dbf8ee 100644
--- a/html-test/ref/DeprecatedFunction3.html
+++ b/html-test/ref/DeprecatedFunction3.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >DeprecatedFunction3</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction3.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedFunction3.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,9 +47,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction3.ht
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Integer</a
 	    ></li
 	  ></ul
@@ -58,9 +59,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction3.ht
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Integer</a
 	    ></p
 	  ><div class="doc"
@@ -73,11 +74,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedFunction3.ht
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedModule.html b/html-test/ref/DeprecatedModule.html
index 1dd3fb45..4a38a820 100644
--- a/html-test/ref/DeprecatedModule.html
+++ b/html-test/ref/DeprecatedModule.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >DeprecatedModule</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedModule.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedModule.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -47,12 +48,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedModule.html"
 	><div class="doc"
 	><div class="warning"
 	  ><p
-	    >Deprecated: Use <a href=""
+	    >Deprecated: Use <a href="#"
 	      >Foo</a
 	      > instead</p
 	    ></div
 	  ><p
-	  >Documentation for <a href=""
+	  >Documentation for <a href="#"
 	    >DeprecatedModule</a
 	    >.</p
 	  ></div
@@ -62,20 +63,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedModule.html"
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ></div
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedModule2.html b/html-test/ref/DeprecatedModule2.html
index dea6dc97..b32e079e 100644
--- a/html-test/ref/DeprecatedModule2.html
+++ b/html-test/ref/DeprecatedModule2.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >DeprecatedModule2</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedModule2.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedModule2.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -56,20 +57,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedModule2.html
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ></div
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedNewtype.html b/html-test/ref/DeprecatedNewtype.html
index c521ec33..084c95b1 100644
--- a/html-test/ref/DeprecatedNewtype.html
+++ b/html-test/ref/DeprecatedNewtype.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >DeprecatedNewtype</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedNewtype.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,21 +49,21 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html
 	><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href=""
+	    > <a href="#"
 	    >SomeNewType</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >SomeNewTypeConst</a
-	    > <a href=""
+	    > <a href="#"
 	    >String</a
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href=""
+	    > <a href="#"
 	    >SomeOtherNewType</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >SomeOtherNewTypeConst</a
-	    > <a href=""
+	    > <a href="#"
 	    >String</a
 	    ></li
 	  ></ul
@@ -74,7 +75,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="" id="t:SomeNewType" class="def"
+	    > <a href="#" id="t:SomeNewType" class="def"
 	    >SomeNewType</a
 	    ></p
 	  ><div class="doc"
@@ -91,9 +92,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:SomeNewTypeConst" class="def"
+		><a href="#" id="v:SomeNewTypeConst" class="def"
 		  >SomeNewTypeConst</a
-		  > <a href=""
+		  > <a href="#"
 		  >String</a
 		  ></td
 		><td class="doc"
@@ -112,7 +113,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="" id="t:SomeOtherNewType" class="def"
+	    > <a href="#" id="t:SomeOtherNewType" class="def"
 	    >SomeOtherNewType</a
 	    ></p
 	  ><div class="doc"
@@ -127,9 +128,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:SomeOtherNewTypeConst" class="def"
+		><a href="#" id="v:SomeOtherNewTypeConst" class="def"
 		  >SomeOtherNewTypeConst</a
-		  > <a href=""
+		  > <a href="#"
 		  >String</a
 		  ></td
 		><td class="doc"
@@ -145,11 +146,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedNewtype.html
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedReExport.html b/html-test/ref/DeprecatedReExport.html
index f73c2996..4279ef80 100644
--- a/html-test/ref/DeprecatedReExport.html
+++ b/html-test/ref/DeprecatedReExport.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >DeprecatedReExport</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedReExport.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedReExport.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,11 +47,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedReExport.htm
 	>Contents</p
 	><ul
 	><li
-	  ><a href=""
+	  ><a href="#"
 	    >Re-exported from an other module</a
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >Re-exported from an other package</a
 	    ></li
 	  ></ul
@@ -72,9 +73,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedReExport.htm
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ></ul
@@ -84,16 +85,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedReExport.htm
 	>Re-exported from an other module</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
 	    ><p
 	      >Deprecated: use <code
-		><a href=""
+		><a href="#"
 		  >bar</a
 		  ></code
 		> instead</p
@@ -106,7 +107,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedReExport.htm
 	>Re-exported from an other package</h1
 	><div class="doc"
 	><p
-	  >Not yet working, see <a href=""
+	  >Not yet working, see <a href="#"
 	    >http://trac.haskell.org/haddock/ticket/223</a
 	    >
  , isEmptyChan</p
@@ -114,11 +115,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedReExport.htm
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedRecord.html b/html-test/ref/DeprecatedRecord.html
index 5991b7dc..c2fb2e0d 100644
--- a/html-test/ref/DeprecatedRecord.html
+++ b/html-test/ref/DeprecatedRecord.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >DeprecatedRecord</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedRecord.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,21 +49,21 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html"
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >Foo</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >Foo</a
 	    > {<ul class="subs"
 	    ><li
-	      ><a href=""
+	      ><a href="#"
 		>fooName</a
-		> :: <a href=""
+		> :: <a href="#"
 		>String</a
 		></li
 	      ><li
-	      ><a href=""
+	      ><a href="#"
 		>fooValue</a
-		> :: <a href=""
+		> :: <a href="#"
 		>Int</a
 		></li
 	      ></ul
@@ -76,7 +77,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html"
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Foo" class="def"
+	    > <a href="#" id="t:Foo" class="def"
 	    >Foo</a
 	    ></p
 	  ><div class="doc"
@@ -89,11 +90,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html"
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:Foo" class="def"
+		><a href="#" id="v:Foo" class="def"
 		  >Foo</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td colspan="2"
@@ -103,9 +104,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html"
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:fooName" class="def"
+			><a href="#" id="v:fooName" class="def"
 			  >fooName</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >String</a
 			  ></dfn
 			><div class="doc"
@@ -115,9 +116,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html"
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="" id="v:fooValue" class="def"
+			><a href="#" id="v:fooValue" class="def"
 			  >fooValue</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Int</a
 			  ></dfn
 			><div class="doc"
@@ -139,11 +140,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedRecord.html"
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedTypeFamily.html b/html-test/ref/DeprecatedTypeFamily.html
index 175c1b25..5539aadb 100644
--- a/html-test/ref/DeprecatedTypeFamily.html
+++ b/html-test/ref/DeprecatedTypeFamily.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >DeprecatedTypeFamily</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeFamily.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedTypeFamily.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,15 +49,23 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeFamily.h
 	><li class="src short"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a href=""
+	    > <a href="#"
 	    >SomeTypeFamily</a
-	    > k :: * -&gt; *</li
+	    > k :: <a href="#"
+	    >*</a
+	    > -&gt; <a href="#"
+	    >*</a
+	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a href=""
+	    > <a href="#"
 	    >SomeOtherTypeFamily</a
-	    > k :: * -&gt; *</li
+	    > k :: <a href="#"
+	    >*</a
+	    > -&gt; <a href="#"
+	    >*</a
+	    ></li
 	  ></ul
 	></div
       ><div id="interface"
@@ -66,9 +75,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeFamily.h
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a href="" id="t:SomeTypeFamily" class="def"
+	    > <a href="#" id="t:SomeTypeFamily" class="def"
 	    >SomeTypeFamily</a
-	    > k :: * -&gt; *</p
+	    > k :: <a href="#"
+	    >*</a
+	    > -&gt; <a href="#"
+	    >*</a
+	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
 	    ><p
@@ -82,9 +95,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeFamily.h
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a href="" id="t:SomeOtherTypeFamily" class="def"
+	    > <a href="#" id="t:SomeOtherTypeFamily" class="def"
 	    >SomeOtherTypeFamily</a
-	    > k :: * -&gt; *</p
+	    > k :: <a href="#"
+	    >*</a
+	    > -&gt; <a href="#"
+	    >*</a
+	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
 	    ><p
@@ -95,11 +112,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeFamily.h
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/DeprecatedTypeSynonym.html b/html-test/ref/DeprecatedTypeSynonym.html
index 0f986624..925f4656 100644
--- a/html-test/ref/DeprecatedTypeSynonym.html
+++ b/html-test/ref/DeprecatedTypeSynonym.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >DeprecatedTypeSynonym</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeSynonym.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedTypeSynonym.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,17 +49,17 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeSynonym.
 	><li class="src short"
 	  ><span class="keyword"
 	    >type</span
-	    > <a href=""
+	    > <a href="#"
 	    >TypeSyn</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >String</a
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >type</span
-	    > <a href=""
+	    > <a href="#"
 	    >OtherTypeSyn</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >String</a
 	    ></li
 	  ></ul
@@ -70,9 +71,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeSynonym.
 	><p class="src"
 	  ><span class="keyword"
 	    >type</span
-	    > <a href="" id="t:TypeSyn" class="def"
+	    > <a href="#" id="t:TypeSyn" class="def"
 	    >TypeSyn</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >String</a
 	    ></p
 	  ><div class="doc"
@@ -88,9 +89,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeSynonym.
 	><p class="src"
 	  ><span class="keyword"
 	    >type</span
-	    > <a href="" id="t:OtherTypeSyn" class="def"
+	    > <a href="#" id="t:OtherTypeSyn" class="def"
 	    >OtherTypeSyn</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >String</a
 	    ></p
 	  ><div class="doc"
@@ -103,11 +104,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_DeprecatedTypeSynonym.
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Examples.html b/html-test/ref/Examples.html
index 57c359df..a8565ae6 100644
--- a/html-test/ref/Examples.html
+++ b/html-test/ref/Examples.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Examples</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Examples.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Examples.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,11 +47,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Examples.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >fib</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Integer</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >Integer</a
 	    ></li
 	  ></ul
@@ -60,17 +61,17 @@ window.onload = function () {pageLoad();setSynopsis("mini_Examples.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:fib" class="def"
+	  ><a href="#" id="v:fib" class="def"
 	    >fib</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Integer</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >Integer</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Fibonacci number of given <code
-	      ><a href=""
+	      ><a href="#"
 		>Integer</a
 		></code
 	      >.</p
@@ -164,11 +165,7 @@ bar
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Extensions.html b/html-test/ref/Extensions.html
index 780466b8..66b77c04 100644
--- a/html-test/ref/Extensions.html
+++ b/html-test/ref/Extensions.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Extensions</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Extensions.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Extensions.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -58,7 +59,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Extensions.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >foobar</a
 	    > :: t</li
 	  ></ul
@@ -68,7 +69,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Extensions.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foobar" class="def"
+	  ><a href="#" id="v:foobar" class="def"
 	    >foobar</a
 	    > :: t</p
 	  ><div class="doc"
@@ -79,11 +80,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Extensions.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/FunArgs.html b/html-test/ref/FunArgs.html
index d889b611..30273c0b 100644
--- a/html-test/ref/FunArgs.html
+++ b/html-test/ref/FunArgs.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >FunArgs</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_FunArgs.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,7 +47,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:f" class="def"
+	  ><a href="#" id="v:f" class="def"
 	    >f</a
 	    ></p
 	  ><div class="subs arguments"
@@ -55,15 +56,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: <a href=""
+		>:: <a href="#"
 		  >Ord</a
 		  > a</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		>=&gt; <a href=""
+		>=&gt; <a href="#"
 		  >Int</a
 		  ></td
 		><td class="doc"
@@ -81,7 +82,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href=""
+		>-&gt; <a href="#"
 		  >Bool</a
 		  ></td
 		><td class="doc"
@@ -110,7 +111,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:g" class="def"
+	  ><a href="#" id="v:g" class="def"
 	    >g</a
 	    ></p
 	  ><div class="subs arguments"
@@ -154,7 +155,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:h" class="def"
+	  ><a href="#" id="v:h" class="def"
 	    >h</a
 	    ></p
 	  ><div class="subs arguments"
@@ -198,7 +199,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:i" class="def"
+	  ><a href="#" id="v:i" class="def"
 	    >i</a
 	    ></p
 	  ><div class="subs arguments"
@@ -209,13 +210,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 	      ><td class="src"
 		>:: <span class="keyword"
 		  >forall</span
-		  > (b :: <a href=""
-		  >()</a
-		  >). (d ~ <a href=""
+		  > (b :: ()). d ~ <a href="#"
 		  >()</a
-		  >)</td
+		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
@@ -238,7 +237,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:j" class="def"
+	  ><a href="#" id="v:j" class="def"
 	    >j</a
 	    ></p
 	  ><div class="subs arguments"
@@ -249,9 +248,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 	      ><td class="src"
 		>:: <span class="keyword"
 		  >forall</span
-		  > (a :: <a href=""
-		  >()</a
-		  >). proxy a</td
+		  > (a :: ()). proxy a</td
 		><td class="doc"
 		><p
 		  >First argument</p
@@ -271,11 +268,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_FunArgs.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/GADTRecords.html b/html-test/ref/GADTRecords.html
index b5b60d0f..8ee4b332 100644
--- a/html-test/ref/GADTRecords.html
+++ b/html-test/ref/GADTRecords.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >GADTRecords</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_GADTRecords.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,55 +49,41 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >H1</a
 	    > a b <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
 	    ><li
-	      ><a href=""
+	      ><a href="#"
 		>C1</a
-		> ::  <a href=""
+		> :: <a href="#"
 		>H1</a
 		> a b</li
 	      ><li
-	      ><a href=""
+	      ><a href="#"
 		>C2</a
-		> :: <a href=""
+		> :: <a href="#"
 		>Ord</a
-		> a =&gt; [a] -&gt; <a href=""
+		> a =&gt; [a] -&gt; <a href="#"
 		>H1</a
 		> a a</li
 	      ><li
-	      ><a href=""
+	      ><a href="#"
 		>C3</a
-		> :: { <ul class="subs"
-		><li
-		  ><a href=""
-		    >field</a
-		    > :: <a href=""
-		    >Int</a
-		    ></li
-		  ></ul
-		> } -&gt; <a href=""
+		> :: {..} -&gt; <a href="#"
 		>H1</a
-		> <a href=""
+		> <a href="#"
 		>Int</a
-		> <a href=""
+		> <a href="#"
 		>Int</a
 		></li
 	      ><li
-	      ><a href=""
+	      ><a href="#"
 		>C4</a
-		> :: { <ul class="subs"
-		><li
-		  ><a href=""
-		    >field2</a
-		    > :: a</li
-		  ></ul
-		> } -&gt; <a href=""
+		> :: {..} -&gt; <a href="#"
 		>H1</a
-		> <a href=""
+		> <a href="#"
 		>Int</a
 		> a</li
 	      ></ul
@@ -110,7 +97,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:H1" class="def"
+	    > <a href="#" id="t:H1" class="def"
 	    >H1</a
 	    > a b <span class="keyword"
 	    >where</span
@@ -125,41 +112,39 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:C1" class="def"
+		><a href="#" id="v:C1" class="def"
 		  >C1</a
-		  > ::  <a href=""
+		  > :: <a href="#"
 		  >H1</a
 		  > a b</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:C2" class="def"
+		><a href="#" id="v:C2" class="def"
 		  >C2</a
-		  > :: <a href=""
+		  > :: <a href="#"
 		  >Ord</a
-		  > a =&gt; [a] -&gt; <a href=""
+		  > a =&gt; [a] -&gt; <a href="#"
 		  >H1</a
 		  > a a</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:C3" class="def"
+		><a href="#" id="v:C3" class="def"
 		  >C3</a
-		  > ::  <a href=""
-		  >Int</a
-		  > -&gt; <a href=""
+		  > :: {..} -&gt; <a href="#"
 		  >H1</a
-		  > <a href=""
+		  > <a href="#"
 		  >Int</a
-		  > <a href=""
+		  > <a href="#"
 		  >Int</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td colspan="2"
@@ -169,9 +154,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:field" class="def"
+			><a href="#" id="v:field" class="def"
 			  >field</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Int</a
 			  ></dfn
 			><div class="doc"
@@ -185,15 +170,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:C4" class="def"
+		><a href="#" id="v:C4" class="def"
 		  >C4</a
-		  > ::  a -&gt; <a href=""
+		  > :: {..} -&gt; <a href="#"
 		  >H1</a
-		  > <a href=""
+		  > <a href="#"
 		  >Int</a
 		  > a</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td colspan="2"
@@ -203,7 +188,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:field2" class="def"
+			><a href="#" id="v:field2" class="def"
 			  >field2</a
 			  > :: a</dfn
 			><div class="doc"
@@ -221,11 +206,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_GADTRecords.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html
index 6e15a771..f4e2d9ee 100644
--- a/html-test/ref/Hash.html
+++ b/html-test/ref/Hash.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Hash</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,13 +47,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	>Contents</p
 	><ul
 	><li
-	  ><a href=""
+	  ><a href="#"
 	    >The <code
 	      >HashTable</code
 	      > type</a
 	    ><ul
 	    ><li
-	      ><a href=""
+	      ><a href="#"
 		>Operations on <code
 		  >HashTable</code
 		  >s</a
@@ -60,7 +61,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	      ></ul
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >The <code
 	      >Hash</code
 	      > class</a
@@ -83,58 +84,52 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >HashTable</a
 	    > key val</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >new</a
-	    > :: (<a href=""
+	    > :: (<a href="#"
 	    >Eq</a
-	    > key, <a href=""
+	    > key, <a href="#"
 	    >Hash</a
-	    > key) =&gt; <a href=""
+	    > key) =&gt; <a href="#"
 	    >Int</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >IO</a
-	    > (<a href=""
+	    > (<a href="#"
 	    >HashTable</a
 	    > key val)</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >insert</a
-	    > :: (<a href=""
+	    > :: (<a href="#"
 	    >Eq</a
-	    > key, <a href=""
+	    > key, <a href="#"
 	    >Hash</a
-	    > key) =&gt; key -&gt; val -&gt; <a href=""
+	    > key) =&gt; key -&gt; val -&gt; <a href="#"
 	    >IO</a
 	    > ()</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >lookup</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Hash</a
-	    > key =&gt; key -&gt; <a href=""
+	    > key =&gt; key -&gt; <a href="#"
 	    >IO</a
-	    > (<a href=""
+	    > (<a href="#"
 	    >Maybe</a
 	    > val)</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href=""
+	    > <a href="#"
 	    >Hash</a
 	    > a <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
-	    ><li
-	      ><a href=""
-		>hash</a
-		> :: a -&gt; <a href=""
-		>Int</a
-		></li
-	      ></ul
+	    ></ul
 	    ></li
 	  ></ul
 	></div
@@ -147,7 +142,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:HashTable" class="def"
+	    > <a href="#" id="t:HashTable" class="def"
 	    >HashTable</a
 	    > key val</p
 	  ><div class="doc"
@@ -160,7 +155,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
  The type <code
 	      >key</code
 	      > should be an instance of <code
-	      ><a href=""
+	      ><a href="#"
 		>Eq</a
 		></code
 	      >.</p
@@ -172,17 +167,17 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	  >s</h2
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:new" class="def"
+	  ><a href="#" id="v:new" class="def"
 	    >new</a
-	    > :: (<a href=""
+	    > :: (<a href="#"
 	    >Eq</a
-	    > key, <a href=""
+	    > key, <a href="#"
 	    >Hash</a
-	    > key) =&gt; <a href=""
+	    > key) =&gt; <a href="#"
 	    >Int</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >IO</a
-	    > (<a href=""
+	    > (<a href="#"
 	    >HashTable</a
 	    > key val)</p
 	  ><div class="doc"
@@ -192,13 +187,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:insert" class="def"
+	  ><a href="#" id="v:insert" class="def"
 	    >insert</a
-	    > :: (<a href=""
+	    > :: (<a href="#"
 	    >Eq</a
-	    > key, <a href=""
+	    > key, <a href="#"
 	    >Hash</a
-	    > key) =&gt; key -&gt; val -&gt; <a href=""
+	    > key) =&gt; key -&gt; val -&gt; <a href="#"
 	    >IO</a
 	    > ()</p
 	  ><div class="doc"
@@ -208,26 +203,26 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:lookup" class="def"
+	  ><a href="#" id="v:lookup" class="def"
 	    >lookup</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Hash</a
-	    > key =&gt; key -&gt; <a href=""
+	    > key =&gt; key -&gt; <a href="#"
 	    >IO</a
-	    > (<a href=""
+	    > (<a href="#"
 	    >Maybe</a
 	    > val)</p
 	  ><div class="doc"
 	  ><p
 	    >Looks up a key in the hash table, returns <code
 	      ><code
-		><a href=""
+		><a href="#"
 		  >Just</a
 		  ></code
 		> val</code
 	      > if the key
  was found, or <code
-	      ><a href=""
+	      ><a href="#"
 		>Nothing</a
 		></code
 	      > otherwise.</p
@@ -241,7 +236,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:Hash" class="def"
+	    > <a href="#" id="t:Hash" class="def"
 	    >Hash</a
 	    > a <span class="keyword"
 	    >where</span
@@ -250,13 +245,21 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	  ><p
 	    >A class of types which can be hashed.</p
 	    ></div
+	  ><div class="subs minimal"
+	  ><p class="caption"
+	    >Minimal complete definition</p
+	    ><p class="src"
+	    ><a href="#"
+	      >hash</a
+	      ></p
+	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="" id="v:hash" class="def"
+	    ><a href="#" id="v:hash" class="def"
 	      >hash</a
-	      > :: a -&gt; <a href=""
+	      > :: a -&gt; <a href="#"
 	      >Int</a
 	      ></p
 	    ><div class="doc"
@@ -264,7 +267,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	      >hashes the value of type <code
 		>a</code
 		> into an <code
-		><a href=""
+		><a href="#"
 		  >Int</a
 		  ></code
 		></p
@@ -280,14 +283,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:ic:Hash:Hash:1" class="instance expander" onclick="toggleSection('i:ic:Hash:Hash:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Hash</a
-		      > <a href=""
+		      > <a href="#"
 		      >Float</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td colspan="2"
@@ -296,11 +299,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >hash</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Float</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >Int</a
 			  ></p
 			></div
@@ -312,14 +315,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:ic:Hash:Hash:2" class="instance expander" onclick="toggleSection('i:ic:Hash:Hash:2')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Hash</a
-		      > <a href=""
+		      > <a href="#"
 		      >Int</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td colspan="2"
@@ -328,11 +331,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >hash</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Int</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >Int</a
 			  ></p
 			></div
@@ -344,16 +347,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:ic:Hash:Hash:3" class="instance expander" onclick="toggleSection('i:ic:Hash:Hash:3')"
 		      ></span
-		      > (<a href=""
+		      > (<a href="#"
 		      >Hash</a
-		      > a, <a href=""
+		      > a, <a href="#"
 		      >Hash</a
-		      > b) =&gt; <a href=""
+		      > b) =&gt; <a href="#"
 		      >Hash</a
 		      > (a, b)</span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td colspan="2"
@@ -362,9 +365,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >hash</a
-			  > :: (a, b) -&gt; <a href=""
+			  > :: (a, b) -&gt; <a href="#"
 			  >Int</a
 			  ></p
 			></div
@@ -378,11 +381,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hash.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/HiddenInstances.html b/html-test/ref/HiddenInstances.html
index 3eb94df8..d18c6b6c 100644
--- a/html-test/ref/HiddenInstances.html
+++ b/html-test/ref/HiddenInstances.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >HiddenInstances</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstances.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,13 +49,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 	><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href=""
+	    > <a href="#"
 	    >VisibleClass</a
 	    > a</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >VisibleData</a
 	    ></li
 	  ></ul
@@ -66,7 +67,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:VisibleClass" class="def"
+	    > <a href="#" id="t:VisibleClass" class="def"
 	    >VisibleClass</a
 	    > a</p
 	  ><div class="doc"
@@ -83,9 +84,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 		  ><span class="inst-left"
 		    ><span id="control.i:ic:VisibleClass:VisibleClass:1" class="instance expander" onclick="toggleSection('i:ic:VisibleClass:VisibleClass:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >VisibleClass</a
-		      > <a href=""
+		      > <a href="#"
 		      >Int</a
 		      ></span
 		    ></td
@@ -105,9 +106,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 		  ><span class="inst-left"
 		    ><span id="control.i:ic:VisibleClass:VisibleClass:2" class="instance expander" onclick="toggleSection('i:ic:VisibleClass:VisibleClass:2')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >VisibleClass</a
-		      > <a href=""
+		      > <a href="#"
 		      >VisibleData</a
 		      ></span
 		    ></td
@@ -130,7 +131,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:VisibleData" class="def"
+	    > <a href="#" id="t:VisibleData" class="def"
 	    >VisibleData</a
 	    ></p
 	  ><div class="doc"
@@ -147,9 +148,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 		  ><span class="inst-left"
 		    ><span id="control.i:id:VisibleData:Num:1" class="instance expander" onclick="toggleSection('i:id:VisibleData:Num:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Num</a
-		      > <a href=""
+		      > <a href="#"
 		      >VisibleData</a
 		      ></span
 		    ></td
@@ -165,65 +166,65 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >(+)</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >VisibleData</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >VisibleData</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >VisibleData</a
 			  ></p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >(-)</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >VisibleData</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >VisibleData</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >VisibleData</a
 			  ></p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >(*)</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >VisibleData</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >VisibleData</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >VisibleData</a
 			  ></p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >negate</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >VisibleData</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >VisibleData</a
 			  ></p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >abs</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >VisibleData</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >VisibleData</a
 			  ></p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >signum</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >VisibleData</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >VisibleData</a
 			  ></p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >fromInteger</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Integer</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >VisibleData</a
 			  ></p
 			></div
@@ -235,9 +236,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 		  ><span class="inst-left"
 		    ><span id="control.i:id:VisibleData:VisibleClass:2" class="instance expander" onclick="toggleSection('i:id:VisibleData:VisibleClass:2')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >VisibleClass</a
-		      > <a href=""
+		      > <a href="#"
 		      >VisibleData</a
 		      ></span
 		    ></td
@@ -259,11 +260,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstances.html")
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/HiddenInstancesB.html b/html-test/ref/HiddenInstancesB.html
index 8a1eb968..17f1d03f 100644
--- a/html-test/ref/HiddenInstancesB.html
+++ b/html-test/ref/HiddenInstancesB.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >HiddenInstancesB</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstancesB.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,13 +49,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html"
 	><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href=""
+	    > <a href="#"
 	    >Foo</a
 	    > a</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >Bar</a
 	    ></li
 	  ></ul
@@ -66,7 +67,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html"
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:Foo" class="def"
+	    > <a href="#" id="t:Foo" class="def"
 	    >Foo</a
 	    > a</p
 	  ><div class="doc"
@@ -83,9 +84,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html"
 		  ><span class="inst-left"
 		    ><span id="control.i:ic:Foo:Foo:1" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Foo</a
-		      > <a href=""
+		      > <a href="#"
 		      >Bar</a
 		      ></span
 		    ></td
@@ -108,7 +109,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html"
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Bar" class="def"
+	    > <a href="#" id="t:Bar" class="def"
 	    >Bar</a
 	    ></p
 	  ><div class="doc"
@@ -125,9 +126,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html"
 		  ><span class="inst-left"
 		    ><span id="control.i:id:Bar:Foo:1" class="instance expander" onclick="toggleSection('i:id:Bar:Foo:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Foo</a
-		      > <a href=""
+		      > <a href="#"
 		      >Bar</a
 		      ></span
 		    ></td
@@ -149,11 +150,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_HiddenInstancesB.html"
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Hyperlinks.html b/html-test/ref/Hyperlinks.html
index b5547e50..964da904 100644
--- a/html-test/ref/Hyperlinks.html
+++ b/html-test/ref/Hyperlinks.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Hyperlinks</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Hyperlinks.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hyperlinks.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,9 +47,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hyperlinks.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ></ul
@@ -58,18 +59,18 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hyperlinks.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
 	  ><p
-	    >A plain URL: <a href=""
+	    >A plain URL: <a href="#"
 	      >http://example.com/</a
 	      ></p
 	    ><p
-	    >A URL with a label: <a href=""
+	    >A URL with a label: <a href="#"
 	      >some link</a
 	      ></p
 	    ></div
@@ -77,11 +78,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Hyperlinks.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/IgnoreExports.html b/html-test/ref/IgnoreExports.html
index 6591f0d3..cd8d2388 100644
--- a/html-test/ref/IgnoreExports.html
+++ b/html-test/ref/IgnoreExports.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >IgnoreExports</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_IgnoreExports.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_IgnoreExports.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,15 +47,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_IgnoreExports.html");}
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >bar</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ></ul
@@ -64,9 +65,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_IgnoreExports.html");}
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -76,9 +77,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_IgnoreExports.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:bar" class="def"
+	  ><a href="#" id="v:bar" class="def"
 	    >bar</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -89,11 +90,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_IgnoreExports.html");}
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/ImplicitParams.html b/html-test/ref/ImplicitParams.html
index c81f484b..68656338 100644
--- a/html-test/ref/ImplicitParams.html
+++ b/html-test/ref/ImplicitParams.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >ImplicitParams</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_ImplicitParams.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_ImplicitParams.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,7 +49,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_ImplicitParams.html");
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:X" class="def"
+	    > <a href="#" id="t:X" class="def"
 	    >X</a
 	    ></p
 	  ><div class="subs constructors"
@@ -57,55 +58,51 @@ window.onload = function () {pageLoad();setSynopsis("mini_ImplicitParams.html");
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:X" class="def"
+		><a href="#" id="v:X" class="def"
 		  >X</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:c" class="def"
+	  ><a href="#" id="v:c" class="def"
 	    >c</a
-	    > :: (?x :: <a href=""
+	    > :: (?x :: <a href="#"
 	    >X</a
-	    >) =&gt; <a href=""
+	    >) =&gt; <a href="#"
 	    >X</a
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:d" class="def"
+	  ><a href="#" id="v:d" class="def"
 	    >d</a
-	    > :: (?x :: <a href=""
+	    > :: (?x :: <a href="#"
 	    >X</a
-	    >, ?y :: <a href=""
+	    >, ?y :: <a href="#"
 	    >X</a
-	    >) =&gt; (<a href=""
+	    >) =&gt; (<a href="#"
 	    >X</a
-	    >, <a href=""
+	    >, <a href="#"
 	    >X</a
 	    >)</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:f" class="def"
+	  ><a href="#" id="v:f" class="def"
 	    >f</a
-	    > :: ((?x :: <a href=""
+	    > :: ((?x :: <a href="#"
 	    >X</a
 	    >) =&gt; a) -&gt; a</p
 	  ></div
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Instances.html b/html-test/ref/Instances.html
new file mode 100644
index 00000000..c2904e42
--- /dev/null
+++ b/html-test/ref/Instances.html
@@ -0,0 +1,1708 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+><head
+  ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><title
+    >Instances</title
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+     /><script src="haddock-util.js" type="text/javascript"
+    ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
+    ><script type="text/javascript"
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&quot;);};
+//
+</script
+    ></head
+  ><body
+  ><div id="package-header"
+    ><ul class="links" id="page-menu"
+      ><li
+	><a href="#"
+	  >Contents</a
+	  ></li
+	><li
+	><a href="#"
+	  >Index</a
+	  ></li
+	></ul
+      ><p class="caption empty"
+      ></p
+      ></div
+    ><div id="content"
+    ><div id="module-header"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >Safe</td
+	    ></tr
+	  ></table
+	><p class="caption"
+	>Instances</p
+	></div
+      ><div id="interface"
+      ><h1
+	>Documentation</h1
+	><div class="top"
+	><p class="src"
+	  ><span class="keyword"
+	    >newtype</span
+	    > a <a href="#" id="t:-60--126--126-" class="def"
+	    >&lt;~~</a
+	    > b</p
+	  ><div class="subs constructors"
+	  ><p class="caption"
+	    >Constructors</p
+	    ><table
+	    ><tr
+	      ><td class="src"
+		><a href="#" id="v:Xyzzy" class="def"
+		  >Xyzzy</a
+		  > (b -&gt; (a, a))</td
+		><td class="doc empty"
+		></td
+		></tr
+	      ></table
+	    ></div
+	  ><div class="subs instances"
+	  ><p id="control.i:-60--126--126-" class="caption collapser" onclick="toggleSection('i:-60--126--126-')"
+	    >Instances</p
+	    ><div id="section.i:-60--126--126-" class="show"
+	    ><table
+	      ><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:id:-60--126--126-:Foo:1" class="instance expander" onclick="toggleSection('i:id:-60--126--126-:Foo:1')"
+		      ></span
+		      > <a href="#"
+		      >Foo</a
+		      > (<a href="#"
+		      >(&lt;~~)</a
+		      > a)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:id:-60--126--126-:Foo:1" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >foo</a
+			  > :: (a <a href="#"
+			  >&lt;~~</a
+			  > <a href="#"
+			  >Int</a
+			  >) -&gt; a -&gt; a <a href="#"
+			  >&lt;~~</a
+			  > a</p
+			><p class="src"
+			><a href="#"
+			  >foo'</a
+			  > :: (a <a href="#"
+			  >&lt;~~</a
+			  > (a <a href="#"
+			  >&lt;~~</a
+			  > a)) -&gt; <a href="#"
+			  >Int</a
+			  > -&gt; a <a href="#"
+			  >&lt;~~</a
+			  > (a <a href="#"
+			  >&lt;~~</a
+			  > <a href="#"
+			  >Int</a
+			  >)</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		></table
+	      ></div
+	    ></div
+	  ></div
+	><div class="top"
+	><p class="src"
+	  ><span class="keyword"
+	    >class</span
+	    > <a href="#" id="t:Foo" class="def"
+	    >Foo</a
+	    > f <span class="keyword"
+	    >where</span
+	    ></p
+	  ><div class="subs methods"
+	  ><p class="caption"
+	    >Methods</p
+	    ><p class="src"
+	    ><a href="#" id="v:foo" class="def"
+	      >foo</a
+	      > :: f <a href="#"
+	      >Int</a
+	      > -&gt; a -&gt; f a</p
+	    ><p class="src"
+	    ><a href="#" id="v:foo-39-" class="def"
+	      >foo'</a
+	      > :: f (f a) -&gt; <a href="#"
+	      >Int</a
+	      > -&gt; f (f <a href="#"
+	      >Int</a
+	      >)</p
+	    ></div
+	  ><div class="subs instances"
+	  ><p id="control.i:Foo" class="caption collapser" onclick="toggleSection('i:Foo')"
+	    >Instances</p
+	    ><div id="section.i:Foo" class="show"
+	    ><table
+	      ><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Foo:Foo:1" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:1')"
+		      ></span
+		      > <a href="#"
+		      >Foo</a
+		      > []</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Foo:Foo:1" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >foo</a
+			  > :: [<a href="#"
+			  >Int</a
+			  >] -&gt; a -&gt; [a]</p
+			><p class="src"
+			><a href="#"
+			  >foo'</a
+			  > :: [[a]] -&gt; <a href="#"
+			  >Int</a
+			  > -&gt; [[<a href="#"
+			  >Int</a
+			  >]]</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Foo:Foo:2" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:2')"
+		      ></span
+		      > <a href="#"
+		      >Foo</a
+		      > <a href="#"
+		      >Maybe</a
+		      ></span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Foo:Foo:2" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >foo</a
+			  > :: <a href="#"
+			  >Maybe</a
+			  > <a href="#"
+			  >Int</a
+			  > -&gt; a -&gt; <a href="#"
+			  >Maybe</a
+			  > a</p
+			><p class="src"
+			><a href="#"
+			  >foo'</a
+			  > :: <a href="#"
+			  >Maybe</a
+			  > (<a href="#"
+			  >Maybe</a
+			  > a) -&gt; <a href="#"
+			  >Int</a
+			  > -&gt; <a href="#"
+			  >Maybe</a
+			  > (<a href="#"
+			  >Maybe</a
+			  > <a href="#"
+			  >Int</a
+			  >)</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Foo:Foo:3" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:3')"
+		      ></span
+		      > <a href="#"
+		      >Foo</a
+		      > ((-&gt;) a)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Foo:Foo:3" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >foo</a
+			  > :: (a -&gt; <a href="#"
+			  >Int</a
+			  >) -&gt; a -&gt; a -&gt; a</p
+			><p class="src"
+			><a href="#"
+			  >foo'</a
+			  > :: (a -&gt; a -&gt; a) -&gt; <a href="#"
+			  >Int</a
+			  > -&gt; a -&gt; a -&gt; <a href="#"
+			  >Int</a
+			  ></p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Foo:Foo:4" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:4')"
+		      ></span
+		      > <a href="#"
+		      >Foo</a
+		      > (<a href="#"
+		      >Either</a
+		      > a)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Foo:Foo:4" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >foo</a
+			  > :: <a href="#"
+			  >Either</a
+			  > a <a href="#"
+			  >Int</a
+			  > -&gt; a -&gt; <a href="#"
+			  >Either</a
+			  > a a</p
+			><p class="src"
+			><a href="#"
+			  >foo'</a
+			  > :: <a href="#"
+			  >Either</a
+			  > a (<a href="#"
+			  >Either</a
+			  > a a) -&gt; <a href="#"
+			  >Int</a
+			  > -&gt; <a href="#"
+			  >Either</a
+			  > a (<a href="#"
+			  >Either</a
+			  > a <a href="#"
+			  >Int</a
+			  >)</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Foo:Foo:5" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:5')"
+		      ></span
+		      > (<a href="#"
+		      >Eq</a
+		      > a, <a href="#"
+		      >Foo</a
+		      > f) =&gt; <a href="#"
+		      >Foo</a
+		      > (<a href="#"
+		      >(,)</a
+		      > (f a))</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Foo:Foo:5" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >foo</a
+			  > :: (f a, <a href="#"
+			  >Int</a
+			  >) -&gt; a -&gt; (f a, a)</p
+			><p class="src"
+			><a href="#"
+			  >foo'</a
+			  > :: (f a, (f a, a)) -&gt; <a href="#"
+			  >Int</a
+			  > -&gt; (f a, (f a, <a href="#"
+			  >Int</a
+			  >))</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Foo:Foo:6" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:6')"
+		      ></span
+		      > <a href="#"
+		      >Foo</a
+		      > (<a href="#"
+		      >(&lt;~~)</a
+		      > a)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Foo:Foo:6" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >foo</a
+			  > :: (a <a href="#"
+			  >&lt;~~</a
+			  > <a href="#"
+			  >Int</a
+			  >) -&gt; a -&gt; a <a href="#"
+			  >&lt;~~</a
+			  > a</p
+			><p class="src"
+			><a href="#"
+			  >foo'</a
+			  > :: (a <a href="#"
+			  >&lt;~~</a
+			  > (a <a href="#"
+			  >&lt;~~</a
+			  > a)) -&gt; <a href="#"
+			  >Int</a
+			  > -&gt; a <a href="#"
+			  >&lt;~~</a
+			  > (a <a href="#"
+			  >&lt;~~</a
+			  > <a href="#"
+			  >Int</a
+			  >)</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Foo:Foo:7" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:7')"
+		      ></span
+		      > <a href="#"
+		      >Foo</a
+		      > (<a href="#"
+		      >(,,)</a
+		      > a a)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Foo:Foo:7" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >foo</a
+			  > :: (a, a, <a href="#"
+			  >Int</a
+			  >) -&gt; a -&gt; (a, a, a)</p
+			><p class="src"
+			><a href="#"
+			  >foo'</a
+			  > :: (a, a, (a, a, a)) -&gt; <a href="#"
+			  >Int</a
+			  > -&gt; (a, a, (a, a, <a href="#"
+			  >Int</a
+			  >))</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Foo:Foo:8" class="instance expander" onclick="toggleSection('i:ic:Foo:Foo:8')"
+		      ></span
+		      > <a href="#"
+		      >Foo</a
+		      > (<a href="#"
+		      >Quux</a
+		      > a b)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Foo:Foo:8" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >foo</a
+			  > :: <a href="#"
+			  >Quux</a
+			  > a b <a href="#"
+			  >Int</a
+			  > -&gt; a -&gt; <a href="#"
+			  >Quux</a
+			  > a b a</p
+			><p class="src"
+			><a href="#"
+			  >foo'</a
+			  > :: <a href="#"
+			  >Quux</a
+			  > a b (<a href="#"
+			  >Quux</a
+			  > a b a) -&gt; <a href="#"
+			  >Int</a
+			  > -&gt; <a href="#"
+			  >Quux</a
+			  > a b (<a href="#"
+			  >Quux</a
+			  > a b <a href="#"
+			  >Int</a
+			  >)</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		></table
+	      ></div
+	    ></div
+	  ></div
+	><div class="top"
+	><p class="src"
+	  ><span class="keyword"
+	    >class</span
+	    > <a href="#"
+	    >Foo</a
+	    > f =&gt; <a href="#" id="t:Bar" class="def"
+	    >Bar</a
+	    > f a <span class="keyword"
+	    >where</span
+	    ></p
+	  ><div class="subs methods"
+	  ><p class="caption"
+	    >Methods</p
+	    ><p class="src"
+	    ><a href="#" id="v:bar" class="def"
+	      >bar</a
+	      > :: f a -&gt; f <a href="#"
+	      >Bool</a
+	      > -&gt; a</p
+	    ><p class="src"
+	    ><a href="#" id="v:bar-39-" class="def"
+	      >bar'</a
+	      > :: f (f a) -&gt; f (f (f b))</p
+	    ><p class="src"
+	    ><a href="#" id="v:bar0" class="def"
+	      >bar0</a
+	      >, <a href="#" id="v:bar1" class="def"
+	      >bar1</a
+	      > :: (f a, f a) -&gt; (f b, f c)</p
+	    ></div
+	  ><div class="subs instances"
+	  ><p id="control.i:Bar" class="caption collapser" onclick="toggleSection('i:Bar')"
+	    >Instances</p
+	    ><div id="section.i:Bar" class="show"
+	    ><table
+	      ><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Bar:Bar:1" class="instance expander" onclick="toggleSection('i:ic:Bar:Bar:1')"
+		      ></span
+		      > <a href="#"
+		      >Bar</a
+		      > <a href="#"
+		      >Maybe</a
+		      > <a href="#"
+		      >Bool</a
+		      ></span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Bar:Bar:1" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >bar</a
+			  > :: <a href="#"
+			  >Maybe</a
+			  > <a href="#"
+			  >Bool</a
+			  > -&gt; <a href="#"
+			  >Maybe</a
+			  > <a href="#"
+			  >Bool</a
+			  > -&gt; <a href="#"
+			  >Bool</a
+			  ></p
+			><p class="src"
+			><a href="#"
+			  >bar'</a
+			  > :: <a href="#"
+			  >Maybe</a
+			  > (<a href="#"
+			  >Maybe</a
+			  > <a href="#"
+			  >Bool</a
+			  >) -&gt; <a href="#"
+			  >Maybe</a
+			  > (<a href="#"
+			  >Maybe</a
+			  > (<a href="#"
+			  >Maybe</a
+			  > b))</p
+			><p class="src"
+			><a href="#"
+			  >bar0</a
+			  > :: (<a href="#"
+			  >Maybe</a
+			  > <a href="#"
+			  >Bool</a
+			  >, <a href="#"
+			  >Maybe</a
+			  > <a href="#"
+			  >Bool</a
+			  >) -&gt; (<a href="#"
+			  >Maybe</a
+			  > b, <a href="#"
+			  >Maybe</a
+			  > c)</p
+			><p class="src"
+			><a href="#"
+			  >bar1</a
+			  > :: (<a href="#"
+			  >Maybe</a
+			  > <a href="#"
+			  >Bool</a
+			  >, <a href="#"
+			  >Maybe</a
+			  > <a href="#"
+			  >Bool</a
+			  >) -&gt; (<a href="#"
+			  >Maybe</a
+			  > b, <a href="#"
+			  >Maybe</a
+			  > c)</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Bar:Bar:2" class="instance expander" onclick="toggleSection('i:ic:Bar:Bar:2')"
+		      ></span
+		      > <a href="#"
+		      >Bar</a
+		      > <a href="#"
+		      >Maybe</a
+		      > [a]</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Bar:Bar:2" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >bar</a
+			  > :: <a href="#"
+			  >Maybe</a
+			  > [a] -&gt; <a href="#"
+			  >Maybe</a
+			  > <a href="#"
+			  >Bool</a
+			  > -&gt; [a]</p
+			><p class="src"
+			><a href="#"
+			  >bar'</a
+			  > :: <a href="#"
+			  >Maybe</a
+			  > (<a href="#"
+			  >Maybe</a
+			  > [a]) -&gt; <a href="#"
+			  >Maybe</a
+			  > (<a href="#"
+			  >Maybe</a
+			  > (<a href="#"
+			  >Maybe</a
+			  > b))</p
+			><p class="src"
+			><a href="#"
+			  >bar0</a
+			  > :: (<a href="#"
+			  >Maybe</a
+			  > [a], <a href="#"
+			  >Maybe</a
+			  > [a]) -&gt; (<a href="#"
+			  >Maybe</a
+			  > b, <a href="#"
+			  >Maybe</a
+			  > c)</p
+			><p class="src"
+			><a href="#"
+			  >bar1</a
+			  > :: (<a href="#"
+			  >Maybe</a
+			  > [a], <a href="#"
+			  >Maybe</a
+			  > [a]) -&gt; (<a href="#"
+			  >Maybe</a
+			  > b, <a href="#"
+			  >Maybe</a
+			  > c)</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Bar:Bar:3" class="instance expander" onclick="toggleSection('i:ic:Bar:Bar:3')"
+		      ></span
+		      > <a href="#"
+		      >Bar</a
+		      > [] (a, a)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Bar:Bar:3" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >bar</a
+			  > :: [(a, a)] -&gt; [<a href="#"
+			  >Bool</a
+			  >] -&gt; (a, a)</p
+			><p class="src"
+			><a href="#"
+			  >bar'</a
+			  > :: [[(a, a)]] -&gt; [[[b]]]</p
+			><p class="src"
+			><a href="#"
+			  >bar0</a
+			  > :: ([(a, a)], [(a, a)]) -&gt; ([b], [c])</p
+			><p class="src"
+			><a href="#"
+			  >bar1</a
+			  > :: ([(a, a)], [(a, a)]) -&gt; ([b], [c])</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Bar:Bar:4" class="instance expander" onclick="toggleSection('i:ic:Bar:Bar:4')"
+		      ></span
+		      > <a href="#"
+		      >Foo</a
+		      > f =&gt; <a href="#"
+		      >Bar</a
+		      > (<a href="#"
+		      >Either</a
+		      > a) (f a)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Bar:Bar:4" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >bar</a
+			  > :: <a href="#"
+			  >Either</a
+			  > a (f a) -&gt; <a href="#"
+			  >Either</a
+			  > a <a href="#"
+			  >Bool</a
+			  > -&gt; f a</p
+			><p class="src"
+			><a href="#"
+			  >bar'</a
+			  > :: <a href="#"
+			  >Either</a
+			  > a (<a href="#"
+			  >Either</a
+			  > a (f a)) -&gt; <a href="#"
+			  >Either</a
+			  > a (<a href="#"
+			  >Either</a
+			  > a (<a href="#"
+			  >Either</a
+			  > a b))</p
+			><p class="src"
+			><a href="#"
+			  >bar0</a
+			  > :: (<a href="#"
+			  >Either</a
+			  > a (f a), <a href="#"
+			  >Either</a
+			  > a (f a)) -&gt; (<a href="#"
+			  >Either</a
+			  > a b, <a href="#"
+			  >Either</a
+			  > a c)</p
+			><p class="src"
+			><a href="#"
+			  >bar1</a
+			  > :: (<a href="#"
+			  >Either</a
+			  > a (f a), <a href="#"
+			  >Either</a
+			  > a (f a)) -&gt; (<a href="#"
+			  >Either</a
+			  > a b, <a href="#"
+			  >Either</a
+			  > a c)</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Bar:Bar:5" class="instance expander" onclick="toggleSection('i:ic:Bar:Bar:5')"
+		      ></span
+		      > <a href="#"
+		      >Foo</a
+		      > (<a href="#"
+		      >(,,)</a
+		      > a b) =&gt; <a href="#"
+		      >Bar</a
+		      > (<a href="#"
+		      >(,,)</a
+		      > a b) (a, b, a)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Bar:Bar:5" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >bar</a
+			  > :: (a, b, (a, b, a)) -&gt; (a, b, <a href="#"
+			  >Bool</a
+			  >) -&gt; (a, b, a)</p
+			><p class="src"
+			><a href="#"
+			  >bar'</a
+			  > :: (a, b, (a, b, (a, b, a))) -&gt; (a, b, (a, b, (a, b, b)))</p
+			><p class="src"
+			><a href="#"
+			  >bar0</a
+			  > :: ((a, b, (a, b, a)), (a, b, (a, b, a))) -&gt; ((a, b, b), (a, b, c))</p
+			><p class="src"
+			><a href="#"
+			  >bar1</a
+			  > :: ((a, b, (a, b, a)), (a, b, (a, b, a))) -&gt; ((a, b, b), (a, b, c))</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Bar:Bar:6" class="instance expander" onclick="toggleSection('i:ic:Bar:Bar:6')"
+		      ></span
+		      > <a href="#"
+		      >Bar</a
+		      > (<a href="#"
+		      >Quux</a
+		      > a c) (<a href="#"
+		      >Quux</a
+		      > a b c)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Bar:Bar:6" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >bar</a
+			  > :: <a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a b c) -&gt; <a href="#"
+			  >Quux</a
+			  > a c <a href="#"
+			  >Bool</a
+			  > -&gt; <a href="#"
+			  >Quux</a
+			  > a b c</p
+			><p class="src"
+			><a href="#"
+			  >bar'</a
+			  > :: <a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a b c)) -&gt; <a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a c b))</p
+			><p class="src"
+			><a href="#"
+			  >bar0</a
+			  > :: (<a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a b c), <a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a b c)) -&gt; (<a href="#"
+			  >Quux</a
+			  > a c b, <a href="#"
+			  >Quux</a
+			  > a c c)</p
+			><p class="src"
+			><a href="#"
+			  >bar1</a
+			  > :: (<a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a b c), <a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a b c)) -&gt; (<a href="#"
+			  >Quux</a
+			  > a c b, <a href="#"
+			  >Quux</a
+			  > a c c)</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		></table
+	      ></div
+	    ></div
+	  ></div
+	><div class="top"
+	><p class="src"
+	  ><span class="keyword"
+	    >class</span
+	    > <a href="#" id="t:Baz" class="def"
+	    >Baz</a
+	    > a <span class="keyword"
+	    >where</span
+	    ></p
+	  ><div class="subs methods"
+	  ><p class="caption"
+	    >Methods</p
+	    ><p class="src"
+	    ><a href="#" id="v:baz" class="def"
+	      >baz</a
+	      > :: a -&gt; (<span class="keyword"
+	      >forall</span
+	      > a. a -&gt; a) -&gt; (b, <span class="keyword"
+	      >forall</span
+	      > c. c -&gt; a) -&gt; (b, c)</p
+	    ><p class="src"
+	    ><a href="#" id="v:baz-39-" class="def"
+	      >baz'</a
+	      > :: b -&gt; (<span class="keyword"
+	      >forall</span
+	      > b. b -&gt; a) -&gt; (<span class="keyword"
+	      >forall</span
+	      > b. b -&gt; a) -&gt; [(b, a)]</p
+	    ><p class="src"
+	    ><a href="#" id="v:baz-39--39-" class="def"
+	      >baz''</a
+	      > :: b -&gt; (<span class="keyword"
+	      >forall</span
+	      > b. (<span class="keyword"
+	      >forall</span
+	      > b. b -&gt; a) -&gt; c) -&gt; <span class="keyword"
+	      >forall</span
+	      > c. c -&gt; b</p
+	    ></div
+	  ><div class="subs instances"
+	  ><p id="control.i:Baz" class="caption collapser" onclick="toggleSection('i:Baz')"
+	    >Instances</p
+	    ><div id="section.i:Baz" class="show"
+	    ><table
+	      ><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Baz:Baz:1" class="instance expander" onclick="toggleSection('i:ic:Baz:Baz:1')"
+		      ></span
+		      > <a href="#"
+		      >Baz</a
+		      > [c]</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Baz:Baz:1" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >baz</a
+			  > :: [c] -&gt; (<span class="keyword"
+			  >forall</span
+			  > a. a -&gt; a) -&gt; (b, <span class="keyword"
+			  >forall</span
+			  > a. a -&gt; [c]) -&gt; (b, c)</p
+			><p class="src"
+			><a href="#"
+			  >baz'</a
+			  > :: b -&gt; (<span class="keyword"
+			  >forall</span
+			  > b. b -&gt; [c]) -&gt; (<span class="keyword"
+			  >forall</span
+			  > b. b -&gt; [c]) -&gt; [(b, [c])]</p
+			><p class="src"
+			><a href="#"
+			  >baz''</a
+			  > :: b -&gt; (<span class="keyword"
+			  >forall</span
+			  > b. (<span class="keyword"
+			  >forall</span
+			  > a. a -&gt; [c]) -&gt; c) -&gt; <span class="keyword"
+			  >forall</span
+			  > a. a -&gt; b</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Baz:Baz:2" class="instance expander" onclick="toggleSection('i:ic:Baz:Baz:2')"
+		      ></span
+		      > <a href="#"
+		      >Baz</a
+		      > (a -&gt; b)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Baz:Baz:2" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >baz</a
+			  > :: (a -&gt; b) -&gt; (<span class="keyword"
+			  >forall</span
+			  > c. c -&gt; c) -&gt; (b, <span class="keyword"
+			  >forall</span
+			  > c. c -&gt; a -&gt; b) -&gt; (b, c)</p
+			><p class="src"
+			><a href="#"
+			  >baz'</a
+			  > :: b -&gt; (<span class="keyword"
+			  >forall</span
+			  > c. c -&gt; a -&gt; b) -&gt; (<span class="keyword"
+			  >forall</span
+			  > c. c -&gt; a -&gt; b) -&gt; [(b, a -&gt; b)]</p
+			><p class="src"
+			><a href="#"
+			  >baz''</a
+			  > :: b -&gt; (<span class="keyword"
+			  >forall</span
+			  > c. (<span class="keyword"
+			  >forall</span
+			  > d. d -&gt; a -&gt; b) -&gt; c) -&gt; <span class="keyword"
+			  >forall</span
+			  > c. c -&gt; b</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Baz:Baz:3" class="instance expander" onclick="toggleSection('i:ic:Baz:Baz:3')"
+		      ></span
+		      > <a href="#"
+		      >Baz</a
+		      > (a, b, c)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Baz:Baz:3" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >baz</a
+			  > :: (a, b, c) -&gt; (<span class="keyword"
+			  >forall</span
+			  > d. d -&gt; d) -&gt; (b, <span class="keyword"
+			  >forall</span
+			  > d. d -&gt; (a, b, c)) -&gt; (b, c)</p
+			><p class="src"
+			><a href="#"
+			  >baz'</a
+			  > :: b -&gt; (<span class="keyword"
+			  >forall</span
+			  > d. d -&gt; (a, b, c)) -&gt; (<span class="keyword"
+			  >forall</span
+			  > d. d -&gt; (a, b, c)) -&gt; [(b, (a, b, c))]</p
+			><p class="src"
+			><a href="#"
+			  >baz''</a
+			  > :: b -&gt; (<span class="keyword"
+			  >forall</span
+			  > d. (<span class="keyword"
+			  >forall</span
+			  > e. e -&gt; (a, b, c)) -&gt; c) -&gt; <span class="keyword"
+			  >forall</span
+			  > d. d -&gt; b</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Baz:Baz:4" class="instance expander" onclick="toggleSection('i:ic:Baz:Baz:4')"
+		      ></span
+		      > <a href="#"
+		      >Baz</a
+		      > (<a href="#"
+		      >Quux</a
+		      > a b c)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Baz:Baz:4" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >baz</a
+			  > :: <a href="#"
+			  >Quux</a
+			  > a b c -&gt; (<span class="keyword"
+			  >forall</span
+			  > d. d -&gt; d) -&gt; (b, <span class="keyword"
+			  >forall</span
+			  > d. d -&gt; <a href="#"
+			  >Quux</a
+			  > a b c) -&gt; (b, c)</p
+			><p class="src"
+			><a href="#"
+			  >baz'</a
+			  > :: b -&gt; (<span class="keyword"
+			  >forall</span
+			  > d. d -&gt; <a href="#"
+			  >Quux</a
+			  > a b c) -&gt; (<span class="keyword"
+			  >forall</span
+			  > d. d -&gt; <a href="#"
+			  >Quux</a
+			  > a b c) -&gt; [(b, <a href="#"
+			  >Quux</a
+			  > a b c)]</p
+			><p class="src"
+			><a href="#"
+			  >baz''</a
+			  > :: b -&gt; (<span class="keyword"
+			  >forall</span
+			  > d. (<span class="keyword"
+			  >forall</span
+			  > e. e -&gt; <a href="#"
+			  >Quux</a
+			  > a b c) -&gt; c) -&gt; <span class="keyword"
+			  >forall</span
+			  > d. d -&gt; b</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Baz:Baz:5" class="instance expander" onclick="toggleSection('i:ic:Baz:Baz:5')"
+		      ></span
+		      > <a href="#"
+		      >Baz</a
+		      > (a, [b], b, a)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Baz:Baz:5" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >baz</a
+			  > :: (a, [b], b, a) -&gt; (<span class="keyword"
+			  >forall</span
+			  > c. c -&gt; c) -&gt; (b, <span class="keyword"
+			  >forall</span
+			  > c. c -&gt; (a, [b], b, a)) -&gt; (b, c)</p
+			><p class="src"
+			><a href="#"
+			  >baz'</a
+			  > :: b -&gt; (<span class="keyword"
+			  >forall</span
+			  > c. c -&gt; (a, [b], b, a)) -&gt; (<span class="keyword"
+			  >forall</span
+			  > c. c -&gt; (a, [b], b, a)) -&gt; [(b, (a, [b], b, a))]</p
+			><p class="src"
+			><a href="#"
+			  >baz''</a
+			  > :: b -&gt; (<span class="keyword"
+			  >forall</span
+			  > c. (<span class="keyword"
+			  >forall</span
+			  > d. d -&gt; (a, [b], b, a)) -&gt; c) -&gt; <span class="keyword"
+			  >forall</span
+			  > c. c -&gt; b</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		></table
+	      ></div
+	    ></div
+	  ></div
+	><div class="top"
+	><p class="src"
+	  ><span class="keyword"
+	    >data</span
+	    > <a href="#" id="t:Quux" class="def"
+	    >Quux</a
+	    > a b c</p
+	  ><div class="subs constructors"
+	  ><p class="caption"
+	    >Constructors</p
+	    ><table
+	    ><tr
+	      ><td class="src"
+		><a href="#" id="v:Qx" class="def"
+		  >Qx</a
+		  > a</td
+		><td class="doc empty"
+		></td
+		></tr
+	      ><tr
+	      ><td class="src"
+		><a href="#" id="v:Qux" class="def"
+		  >Qux</a
+		  > a b</td
+		><td class="doc empty"
+		></td
+		></tr
+	      ><tr
+	      ><td class="src"
+		><a href="#" id="v:Quux" class="def"
+		  >Quux</a
+		  > a b c</td
+		><td class="doc empty"
+		></td
+		></tr
+	      ></table
+	    ></div
+	  ><div class="subs instances"
+	  ><p id="control.i:Quux" class="caption collapser" onclick="toggleSection('i:Quux')"
+	    >Instances</p
+	    ><div id="section.i:Quux" class="show"
+	    ><table
+	      ><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:id:Quux:Foo:1" class="instance expander" onclick="toggleSection('i:id:Quux:Foo:1')"
+		      ></span
+		      > <a href="#"
+		      >Foo</a
+		      > (<a href="#"
+		      >Quux</a
+		      > a b)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:id:Quux:Foo:1" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >foo</a
+			  > :: <a href="#"
+			  >Quux</a
+			  > a b <a href="#"
+			  >Int</a
+			  > -&gt; a -&gt; <a href="#"
+			  >Quux</a
+			  > a b a</p
+			><p class="src"
+			><a href="#"
+			  >foo'</a
+			  > :: <a href="#"
+			  >Quux</a
+			  > a b (<a href="#"
+			  >Quux</a
+			  > a b a) -&gt; <a href="#"
+			  >Int</a
+			  > -&gt; <a href="#"
+			  >Quux</a
+			  > a b (<a href="#"
+			  >Quux</a
+			  > a b <a href="#"
+			  >Int</a
+			  >)</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:id:Quux:Bar:2" class="instance expander" onclick="toggleSection('i:id:Quux:Bar:2')"
+		      ></span
+		      > <a href="#"
+		      >Bar</a
+		      > (<a href="#"
+		      >Quux</a
+		      > a c) (<a href="#"
+		      >Quux</a
+		      > a b c)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:id:Quux:Bar:2" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >bar</a
+			  > :: <a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a b c) -&gt; <a href="#"
+			  >Quux</a
+			  > a c <a href="#"
+			  >Bool</a
+			  > -&gt; <a href="#"
+			  >Quux</a
+			  > a b c</p
+			><p class="src"
+			><a href="#"
+			  >bar'</a
+			  > :: <a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a b c)) -&gt; <a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a c b))</p
+			><p class="src"
+			><a href="#"
+			  >bar0</a
+			  > :: (<a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a b c), <a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a b c)) -&gt; (<a href="#"
+			  >Quux</a
+			  > a c b, <a href="#"
+			  >Quux</a
+			  > a c c)</p
+			><p class="src"
+			><a href="#"
+			  >bar1</a
+			  > :: (<a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a b c), <a href="#"
+			  >Quux</a
+			  > a c (<a href="#"
+			  >Quux</a
+			  > a b c)) -&gt; (<a href="#"
+			  >Quux</a
+			  > a c b, <a href="#"
+			  >Quux</a
+			  > a c c)</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:id:Quux:Baz:3" class="instance expander" onclick="toggleSection('i:id:Quux:Baz:3')"
+		      ></span
+		      > <a href="#"
+		      >Baz</a
+		      > (<a href="#"
+		      >Quux</a
+		      > a b c)</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:id:Quux:Baz:3" class="inst-details hide"
+		    ><div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >baz</a
+			  > :: <a href="#"
+			  >Quux</a
+			  > a b c -&gt; (<span class="keyword"
+			  >forall</span
+			  > d. d -&gt; d) -&gt; (b, <span class="keyword"
+			  >forall</span
+			  > d. d -&gt; <a href="#"
+			  >Quux</a
+			  > a b c) -&gt; (b, c)</p
+			><p class="src"
+			><a href="#"
+			  >baz'</a
+			  > :: b -&gt; (<span class="keyword"
+			  >forall</span
+			  > d. d -&gt; <a href="#"
+			  >Quux</a
+			  > a b c) -&gt; (<span class="keyword"
+			  >forall</span
+			  > d. d -&gt; <a href="#"
+			  >Quux</a
+			  > a b c) -&gt; [(b, <a href="#"
+			  >Quux</a
+			  > a b c)]</p
+			><p class="src"
+			><a href="#"
+			  >baz''</a
+			  > :: b -&gt; (<span class="keyword"
+			  >forall</span
+			  > d. (<span class="keyword"
+			  >forall</span
+			  > e. e -&gt; <a href="#"
+			  >Quux</a
+			  > a b c) -&gt; c) -&gt; <span class="keyword"
+			  >forall</span
+			  > d. d -&gt; b</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span class="keyword"
+		      >data</span
+		      > <a href="#"
+		      >Thud</a
+		      > <a href="#"
+		      >Int</a
+		      > (<a href="#"
+		      >Quux</a
+		      > a [a] c) <ul class="inst"
+		      ><li class="inst"
+			>= <a href="#" id="v:Thuud" class="def"
+			  >Thuud</a
+			  > a</li
+			><li class="inst"
+			>| <a href="#" id="v:Thuuud" class="def"
+			  >Thuuud</a
+			  > <a href="#"
+			  >Int</a
+			  > <a href="#"
+			  >Int</a
+			  ></li
+			></ul
+		      ></span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		></table
+	      ></div
+	    ></div
+	  ></div
+	><div class="top"
+	><p class="src"
+	  ><span class="keyword"
+	    >class</span
+	    > <a href="#" id="t:Norf" class="def"
+	    >Norf</a
+	    > a b <span class="keyword"
+	    >where</span
+	    ></p
+	  ><div class="subs associated-types"
+	  ><p class="caption"
+	    >Associated Types</p
+	    ><p class="src"
+	    ><span class="keyword"
+	      >type</span
+	      > <a href="#" id="t:Plugh" class="def"
+	      >Plugh</a
+	      > a c b</p
+	    ><p class="src"
+	    ><span class="keyword"
+	      >data</span
+	      > <a href="#" id="t:Thud" class="def"
+	      >Thud</a
+	      > a c</p
+	    ></div
+	  ><div class="subs methods"
+	  ><p class="caption"
+	    >Methods</p
+	    ><p class="src"
+	    ><a href="#" id="v:norf" class="def"
+	      >norf</a
+	      > :: <a href="#"
+	      >Plugh</a
+	      > a c b -&gt; a -&gt; (a -&gt; c) -&gt; b</p
+	    ></div
+	  ><div class="subs instances"
+	  ><p id="control.i:Norf" class="caption collapser" onclick="toggleSection('i:Norf')"
+	    >Instances</p
+	    ><div id="section.i:Norf" class="show"
+	    ><table
+	      ><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Norf:Norf:1" class="instance expander" onclick="toggleSection('i:ic:Norf:Norf:1')"
+		      ></span
+		      > <a href="#"
+		      >Norf</a
+		      > <a href="#"
+		      >Int</a
+		      > <a href="#"
+		      >Bool</a
+		      ></span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Norf:Norf:1" class="inst-details hide"
+		    ><div class="subs associated-types"
+		      ><p class="caption"
+			>Associated Types</p
+			><p class="src"
+			><span class="keyword"
+			  >type</span
+			  > <a href="#"
+			  >Plugh</a
+			  > <a href="#"
+			  >Int</a
+			  > c <a href="#"
+			  >Bool</a
+			  > :: <a href="#"
+			  >*</a
+			  ></p
+			><p class="src"
+			><span class="keyword"
+			  >data</span
+			  > <a href="#"
+			  >Thud</a
+			  > <a href="#"
+			  >Int</a
+			  > c :: <a href="#"
+			  >*</a
+			  ></p
+			></div
+		      > <div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >norf</a
+			  > :: <a href="#"
+			  >Plugh</a
+			  > <a href="#"
+			  >Int</a
+			  > c <a href="#"
+			  >Bool</a
+			  > -&gt; <a href="#"
+			  >Int</a
+			  > -&gt; (<a href="#"
+			  >Int</a
+			  > -&gt; c) -&gt; <a href="#"
+			  >Bool</a
+			  ></p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:ic:Norf:Norf:2" class="instance expander" onclick="toggleSection('i:ic:Norf:Norf:2')"
+		      ></span
+		      > <a href="#"
+		      >Norf</a
+		      > [a] [b]</span
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:ic:Norf:Norf:2" class="inst-details hide"
+		    ><div class="subs associated-types"
+		      ><p class="caption"
+			>Associated Types</p
+			><p class="src"
+			><span class="keyword"
+			  >type</span
+			  > <a href="#"
+			  >Plugh</a
+			  > [a] c [b] :: <a href="#"
+			  >*</a
+			  ></p
+			><p class="src"
+			><span class="keyword"
+			  >data</span
+			  > <a href="#"
+			  >Thud</a
+			  > [a] c :: <a href="#"
+			  >*</a
+			  ></p
+			></div
+		      > <div class="subs methods"
+		      ><p class="caption"
+			>Methods</p
+			><p class="src"
+			><a href="#"
+			  >norf</a
+			  > :: <a href="#"
+			  >Plugh</a
+			  > [a] c [b] -&gt; [a] -&gt; ([a] -&gt; c) -&gt; [b]</p
+			></div
+		      ></div
+		    ></td
+		  ></tr
+		></table
+	      ></div
+	    ></div
+	  ></div
+	></div
+      ></div
+    ><div id="footer"
+    ></div
+    ></body
+  ></html
+>
\ No newline at end of file
diff --git a/html-test/ref/Math.html b/html-test/ref/Math.html
index 5b76fd13..e2e962f6 100644
--- a/html-test/ref/Math.html
+++ b/html-test/ref/Math.html
@@ -1,34 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Math</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
     ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
     ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Math.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Math.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -64,9 +63,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Math.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >f</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Integer</a
 	    ></li
 	  ></ul
@@ -76,9 +75,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Math.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=""
+	    > :: <a href="#"
 	    >Integer</a
 	    ></p
 	  ><div class="doc"
@@ -93,11 +92,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Math.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.1</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Minimal.html b/html-test/ref/Minimal.html
index 48c469d1..eb9d1f5d 100644
--- a/html-test/ref/Minimal.html
+++ b/html-test/ref/Minimal.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Minimal</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -56,7 +57,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:Foo" class="def"
+	    > <a href="#" id="t:Foo" class="def"
 	    >Foo</a
 	    > a <span class="keyword"
 	    >where</span
@@ -65,19 +66,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	  ><p class="caption"
 	    >Minimal complete definition</p
 	    ><p class="src"
-	    ><a href=""
+	    ><a href="#"
 	      >foo</a
-	      >, <a href=""
+	      >, <a href="#"
 	      >bar</a
-	      > | <a href=""
+	      > | <a href="#"
 	      >bar</a
-	      >, <a href=""
+	      >, <a href="#"
 	      >bat</a
-	      > | <a href=""
+	      > | <a href="#"
 	      >foo</a
-	      >, <a href=""
+	      >, <a href="#"
 	      >bat</a
-	      > | <a href=""
+	      > | <a href="#"
 	      >fooBarBat</a
 	      ></p
 	    ></div
@@ -85,7 +86,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="" id="v:foo" class="def"
+	    ><a href="#" id="v:foo" class="def"
 	      >foo</a
 	      > :: a</p
 	    ><div class="doc"
@@ -93,15 +94,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	      >Any two of these are required...</p
 	      ></div
 	    ><p class="src"
-	    ><a href="" id="v:bar" class="def"
+	    ><a href="#" id="v:bar" class="def"
 	      >bar</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a href="" id="v:bat" class="def"
+	    ><a href="#" id="v:bat" class="def"
 	      >bat</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a href="" id="v:fooBarBat" class="def"
+	    ><a href="#" id="v:fooBarBat" class="def"
 	      >fooBarBat</a
 	      > :: (a, a, a)</p
 	    ><div class="doc"
@@ -114,7 +115,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:Weird" class="def"
+	    > <a href="#" id="t:Weird" class="def"
 	    >Weird</a
 	    > a <span class="keyword"
 	    >where</span
@@ -123,19 +124,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	  ><p class="caption"
 	    >Minimal complete definition</p
 	    ><p class="src"
-	    ><a href=""
+	    ><a href="#"
 	      >a</a
-	      >, <a href=""
+	      >, <a href="#"
 	      >b</a
-	      >, <a href=""
+	      >, <a href="#"
 	      >c</a
-	      > | <a href=""
+	      > | <a href="#"
 	      >d</a
-	      > | <a href=""
+	      > | <a href="#"
 	      >e</a
-	      >, (<a href=""
+	      >, (<a href="#"
 	      >f</a
-	      > | <a href=""
+	      > | <a href="#"
 	      >g</a
 	      >)</p
 	    ></div
@@ -143,31 +144,31 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="" id="v:a" class="def"
+	    ><a href="#" id="v:a" class="def"
 	      >a</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a href="" id="v:b" class="def"
+	    ><a href="#" id="v:b" class="def"
 	      >b</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a href="" id="v:c" class="def"
+	    ><a href="#" id="v:c" class="def"
 	      >c</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a href="" id="v:d" class="def"
+	    ><a href="#" id="v:d" class="def"
 	      >d</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a href="" id="v:e" class="def"
+	    ><a href="#" id="v:e" class="def"
 	      >e</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a href="" id="v:f" class="def"
+	    ><a href="#" id="v:f" class="def"
 	      >f</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a href="" id="v:g" class="def"
+	    ><a href="#" id="v:g" class="def"
 	      >g</a
 	      > :: a</p
 	    ></div
@@ -176,7 +177,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:NoMins" class="def"
+	    > <a href="#" id="t:NoMins" class="def"
 	    >NoMins</a
 	    > a <span class="keyword"
 	    >where</span
@@ -185,9 +186,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	  ><p class="caption"
 	    >Minimal complete definition</p
 	    ><p class="src"
-	    ><a href=""
+	    ><a href="#"
 	      >x</a
-	      >, <a href=""
+	      >, <a href="#"
 	      >y</a
 	      ></p
 	    ></div
@@ -195,15 +196,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="" id="v:x" class="def"
+	    ><a href="#" id="v:x" class="def"
 	      >x</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a href="" id="v:y" class="def"
+	    ><a href="#" id="v:y" class="def"
 	      >y</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a href="" id="v:z" class="def"
+	    ><a href="#" id="v:z" class="def"
 	      >z</a
 	      > :: a</p
 	    ></div
@@ -212,20 +213,30 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:FullMin" class="def"
+	    > <a href="#" id="t:FullMin" class="def"
 	    >FullMin</a
 	    > a <span class="keyword"
 	    >where</span
 	    ></p
+	  ><div class="subs minimal"
+	  ><p class="caption"
+	    >Minimal complete definition</p
+	    ><p class="src"
+	    ><a href="#"
+	      >aaa</a
+	      >, <a href="#"
+	      >bbb</a
+	      ></p
+	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="" id="v:aaa" class="def"
+	    ><a href="#" id="v:aaa" class="def"
 	      >aaa</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a href="" id="v:bbb" class="def"
+	    ><a href="#" id="v:bbb" class="def"
 	      >bbb</a
 	      > :: a</p
 	    ></div
@@ -234,7 +245,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:PartialMin" class="def"
+	    > <a href="#" id="t:PartialMin" class="def"
 	    >PartialMin</a
 	    > a <span class="keyword"
 	    >where</span
@@ -243,7 +254,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	  ><p class="caption"
 	    >Minimal complete definition</p
 	    ><p class="src"
-	    ><a href=""
+	    ><a href="#"
 	      >ccc</a
 	      >, ddd</p
 	    ></div
@@ -251,7 +262,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="" id="v:ccc" class="def"
+	    ><a href="#" id="v:ccc" class="def"
 	      >ccc</a
 	      > :: a</p
 	    ></div
@@ -260,26 +271,20 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:EmptyMin" class="def"
+	    > <a href="#" id="t:EmptyMin" class="def"
 	    >EmptyMin</a
 	    > a <span class="keyword"
 	    >where</span
 	    ></p
-	  ><div class="subs minimal"
-	  ><p class="caption"
-	    >Minimal complete definition</p
-	    ><p class="src"
-	    >Nothing</p
-	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="" id="v:eee" class="def"
+	    ><a href="#" id="v:eee" class="def"
 	      >eee</a
 	      > :: a</p
 	    ><p class="src"
-	    ><a href="" id="v:fff" class="def"
+	    ><a href="#" id="v:fff" class="def"
 	      >fff</a
 	      > :: a</p
 	    ></div
@@ -287,11 +292,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Minimal.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/ModuleWithWarning.html b/html-test/ref/ModuleWithWarning.html
index fa2a6787..ff6b6c65 100644
--- a/html-test/ref/ModuleWithWarning.html
+++ b/html-test/ref/ModuleWithWarning.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >ModuleWithWarning</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_ModuleWithWarning.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_ModuleWithWarning.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -47,12 +48,12 @@ window.onload = function () {pageLoad();setSynopsis("mini_ModuleWithWarning.html
 	><div class="doc"
 	><div class="warning"
 	  ><p
-	    >Warning: This is an unstable interface.  Prefer functions from <a href=""
+	    >Warning: This is an unstable interface.  Prefer functions from <a href="#"
 	      >Prelude</a
 	      > instead!</p
 	    ></div
 	  ><p
-	  >Documentation for <a href=""
+	  >Documentation for <a href="#"
 	    >ModuleWithWarning</a
 	    >.</p
 	  ></div
@@ -62,20 +63,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_ModuleWithWarning.html
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ></div
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/NamedDoc.html b/html-test/ref/NamedDoc.html
index 64e18711..50590660 100644
--- a/html-test/ref/NamedDoc.html
+++ b/html-test/ref/NamedDoc.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >NamedDoc</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_NamedDoc.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_NamedDoc.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -57,11 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NamedDoc.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Nesting.html b/html-test/ref/Nesting.html
index 7bba5148..37266c5d 100644
--- a/html-test/ref/Nesting.html
+++ b/html-test/ref/Nesting.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Nesting</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Nesting.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Nesting.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,35 +47,35 @@ window.onload = function () {pageLoad();setSynopsis("mini_Nesting.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >d</a
 	    > :: t</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >e</a
 	    > :: t</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >f</a
 	    > :: t</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >g</a
 	    > :: t</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >h</a
 	    > :: t</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >i</a
 	    > :: t</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >j</a
 	    > :: t</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >k</a
 	    > :: t</li
 	  ></ul
@@ -84,7 +85,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Nesting.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:d" class="def"
+	  ><a href="#" id="v:d" class="def"
 	    >d</a
 	    > :: t</p
 	  ><div class="doc"
@@ -116,7 +117,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Nesting.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:e" class="def"
+	  ><a href="#" id="v:e" class="def"
 	    >e</a
 	    > :: t</p
 	  ><div class="doc"
@@ -137,7 +138,7 @@ the presence of this text pushes it out of nesting back to the top.</li
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:f" class="def"
+	  ><a href="#" id="v:f" class="def"
 	    >f</a
 	    > :: t</p
 	  ><div class="doc"
@@ -155,7 +156,7 @@ the presence of this text pushes it out of nesting back to the top.</li
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:g" class="def"
+	  ><a href="#" id="v:g" class="def"
 	    >g</a
 	    > :: t</p
 	  ><div class="doc"
@@ -173,7 +174,7 @@ the presence of this text pushes it out of nesting back to the top.</li
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:h" class="def"
+	  ><a href="#" id="v:h" class="def"
 	    >h</a
 	    > :: t</p
 	  ><div class="doc"
@@ -191,7 +192,7 @@ tracks</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:i" class="def"
+	  ><a href="#" id="v:i" class="def"
 	    >i</a
 	    > :: t</p
 	  ><div class="doc"
@@ -241,7 +242,7 @@ More of the indented list.</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:j" class="def"
+	  ><a href="#" id="v:j" class="def"
 	    >j</a
 	    > :: t</p
 	  ><div class="doc"
@@ -309,7 +310,7 @@ with more of the indented list content.</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:k" class="def"
+	  ><a href="#" id="v:k" class="def"
 	    >k</a
 	    > :: t</p
 	  ><div class="doc"
@@ -335,11 +336,7 @@ with more of the indented list content.</p
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/NoLayout.html b/html-test/ref/NoLayout.html
index 8b47eab8..23017d56 100644
--- a/html-test/ref/NoLayout.html
+++ b/html-test/ref/NoLayout.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >NoLayout</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_NoLayout.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_NoLayout.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,9 +47,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_NoLayout.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >g</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ></ul
@@ -58,15 +59,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_NoLayout.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:g" class="def"
+	  ><a href="#" id="v:g" class="def"
 	    >g</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >the function <code
-	      ><a href=""
+	      ><a href="#"
 		>g</a
 		></code
 	      ></p
@@ -75,11 +76,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NoLayout.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/NonGreedy.html b/html-test/ref/NonGreedy.html
index c22c8ea9..9530b46b 100644
--- a/html-test/ref/NonGreedy.html
+++ b/html-test/ref/NonGreedy.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >NonGreedy</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_NonGreedy.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,7 +47,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >f</a
 	    > :: a</li
 	  ></ul
@@ -56,14 +57,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:f" class="def"
+	  ><a href="#" id="v:f" class="def"
 	    >f</a
 	    > :: a</p
 	  ><div class="doc"
 	  ><p
-	    ><a href=""
+	    ><a href="#"
 	      >url1</a
-	      > <a href=""
+	      > <a href="#"
 	      >url2</a
 	      ></p
 	    ></div
@@ -71,11 +72,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index 6ac8ae38..e22147d6 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Operators</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -54,37 +55,37 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >(+-)</a
 	    > :: a -&gt; a -&gt; a</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >(*/)</a
 	    > :: a -&gt; a -&gt; a</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >foo</a
 	    > :: a -&gt; a -&gt; a</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >Foo</a
 	    ><ul class="subs"
 	    ><li
-	      >= <a href=""
+	      >= <a href="#"
 		>Foo</a
-		> <a href=""
+		> <a href="#"
 		>`Bar`</a
-		> <a href=""
+		> <a href="#"
 		>Foo</a
 		></li
 	      ><li
-	      >| <a href=""
+	      >| <a href="#"
 		>Foo</a
-		> <a href=""
+		> <a href="#"
 		>:-</a
-		> <a href=""
+		> <a href="#"
 		>Foo</a
 		></li
 	      ></ul
@@ -92,21 +93,23 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a href=""
+	    > <a href="#"
 	    >(:+)</a
-	    > ::   t -&gt; t -&gt; [t]</li
+	    > :: <span class="keyword"
+	    >forall</span
+	    > t. t -&gt; t -&gt; [t]</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a href=""
+	    > a <a href="#"
 	    >&lt;-&gt;</a
 	    > b <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
 	    ><li
-	      ><a href=""
+	      ><a href="#"
 		>(:&lt;-&gt;)</a
-		> ::  a -&gt; b -&gt; a <a href=""
+		> :: a -&gt; b -&gt; a <a href="#"
 		>&lt;-&gt;</a
 		> b</li
 	      ></ul
@@ -114,59 +117,45 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >type family</span
-	    > a <a href=""
+	    > a <a href="#"
 	    >++</a
 	    > b</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data family</span
-	    > a <a href=""
+	    > a <a href="#"
 	    >**</a
 	    > b</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > a <a href=""
+	    > a <a href="#"
 	    >&gt;&lt;&gt;</a
-	    > b <span class="keyword"
+	    > b | a -&gt; b <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
 	    ><li
 	      ><span class="keyword"
 		>type</span
-		> a <a href=""
+		> a <a href="#"
 		>&lt;&gt;&lt;</a
-		> b :: *</li
+		> b :: <a href="#"
+		>*</a
+		></li
 	      ><li
 	      ><span class="keyword"
 		>data</span
-		> a <a href=""
+		> a <a href="#"
 		>&gt;&lt;&lt;</a
 		> b</li
-	      ><li
-	      ><a href=""
-		>(&gt;&gt;&lt;)</a
-		>, <a href=""
-		>(&lt;&lt;&gt;)</a
-		> :: a -&gt; b -&gt; ()</li
-	      ><li
-	      ><a href=""
-		>(**&gt;)</a
-		>, <a href=""
-		>(**&lt;)</a
-		>, <a href=""
-		>(&gt;**)</a
-		>, <a href=""
-		>(&lt;**)</a
-		> :: a -&gt; a -&gt; ()</li
 	      ></ul
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >type</span
-	    > <a href=""
+	    > <a href="#"
 	    >(&gt;-&lt;)</a
-	    > a b = a <a href=""
+	    > a b = a <a href="#"
 	    >&lt;-&gt;</a
 	    > b</li
 	  ></ul
@@ -176,7 +165,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="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 +175,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="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 +189,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="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 +205,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Foo" class="def"
+	    > <a href="#" id="t:Foo" class="def"
 	    >Foo</a
 	    ></p
 	  ><div class="doc"
@@ -229,11 +218,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href=""
+		><a href="#"
 		  >Foo</a
-		  > <a href="" id="v:Bar" class="def"
+		  > <a href="#" id="v:Bar" class="def"
 		  >`Bar`</a
-		  > <a href=""
+		  > <a href="#"
 		  >Foo</a
 		  > <span class="fixity"
 		  >infixl 3</span
@@ -247,11 +236,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href=""
+		><a href="#"
 		  >Foo</a
-		  > <a href="" id="v::-45-" class="def"
+		  > <a href="#" id="v::-45-" class="def"
 		  >:-</a
-		  > <a href=""
+		  > <a href="#"
 		  >Foo</a
 		  > <span class="fixity"
 		  >infixr 5</span
@@ -270,9 +259,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a href="" id="v::-43-" class="def"
+	    > <a href="#" id="v::-43-" class="def"
 	    >(:+)</a
-	    > ::   t -&gt; t -&gt; [t] <span class="fixity"
+	    > :: <span class="keyword"
+	    >forall</span
+	    > t. t -&gt; t -&gt; [t] <span class="fixity"
 	    >infixr 3</span
 	    ><span class="rightedge"
 	    ></span
@@ -286,7 +277,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a href="" id="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,9 +296,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="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=""
+		  > :: a -&gt; b -&gt; a <a href="#"
 		  >&lt;-&gt;</a
 		  > b <span class="fixity"
 		  >infixr 6</span
@@ -315,7 +306,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 		  ></span
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -324,7 +315,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > a <a href="" id="t:-43--43-" class="def"
+	    > a <a href="#" id="t:-43--43-" class="def"
 	    >++</a
 	    > b <span class="fixity"
 	    >infix 3</span
@@ -340,7 +331,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > a <a href="" id="t:-42--42-" class="def"
+	    > a <a href="#" id="t:-42--42-" class="def"
 	    >**</a
 	    > b <span class="fixity"
 	    >infix 9</span
@@ -356,9 +347,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > a <a href="" id="t:-62--60--62-" class="def"
+	    > a <a href="#" id="t:-62--60--62-" class="def"
 	    >&gt;&lt;&gt;</a
-	    > b <span class="keyword"
+	    > b | a -&gt; b <span class="keyword"
 	    >where</span
 	    > <span class="fixity"
 	    >infixr 1</span
@@ -369,15 +360,35 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ><p
 	    >Class with fixity, including associated types</p
 	    ></div
+	  ><div class="subs minimal"
+	  ><p class="caption"
+	    >Minimal complete definition</p
+	    ><p class="src"
+	    ><a href="#"
+	      >(&gt;&gt;&lt;)</a
+	      >, <a href="#"
+	      >(&lt;&lt;&gt;)</a
+	      >, <a href="#"
+	      >(**&gt;)</a
+	      >, <a href="#"
+	      >(**&lt;)</a
+	      >, <a href="#"
+	      >(&gt;**)</a
+	      >, <a href="#"
+	      >(&lt;**)</a
+	      ></p
+	    ></div
 	  ><div class="subs associated-types"
 	  ><p class="caption"
 	    >Associated Types</p
 	    ><p class="src"
 	    ><span class="keyword"
 	      >type</span
-	      > a <a href="" id="t:-60--62--60-" class="def"
+	      > a <a href="#" id="t:-60--62--60-" class="def"
 	      >&lt;&gt;&lt;</a
-	      > b :: * <span class="fixity"
+	      > b :: <a href="#"
+	      >*</a
+	      > <span class="fixity"
 	      >infixl 2</span
 	      ><span class="rightedge"
 	      ></span
@@ -385,7 +396,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	    ><p class="src"
 	    ><span class="keyword"
 	      >data</span
-	      > a <a href="" id="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 +408,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="" id="v:-62--62--60-" class="def"
+	    ><a href="#" id="v:-62--62--60-" class="def"
 	      >(&gt;&gt;&lt;)</a
-	      >, <a href="" id="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 +420,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	      ></span
 	      ></p
 	    ><p class="src"
-	    ><a href="" id="v:-42--42--62-" class="def"
+	    ><a href="#" id="v:-42--42--62-" class="def"
 	      >(**&gt;)</a
-	      >, <a href="" id="v:-42--42--60-" class="def"
+	      >, <a href="#" id="v:-42--42--60-" class="def"
 	      >(**&lt;)</a
-	      >, <a href="" id="v:-62--42--42-" class="def"
+	      >, <a href="#" id="v:-62--42--42-" class="def"
 	      >(&gt;**)</a
-	      >, <a href="" id="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,9 +445,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >type</span
-	    > <a href="" id="t:-62--45--60-" class="def"
+	    > <a href="#" id="t:-62--45--60-" class="def"
 	    >(&gt;-&lt;)</a
-	    > a b = a <a href=""
+	    > a b = a <a href="#"
 	    >&lt;-&gt;</a
 	    > b <span class="fixity"
 	    >infixl 6</span
@@ -451,11 +462,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/OrphanInstances.html b/html-test/ref/OrphanInstances.html
index 0f12bb2e..0ece21f5 100644
--- a/html-test/ref/OrphanInstances.html
+++ b/html-test/ref/OrphanInstances.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >OrphanInstances</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_OrphanInstances.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_OrphanInstances.html&quot;);};
+//
 </script
     ></head
   ><body
   ><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
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,7 +47,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_OrphanInstances.html")
 	>Contents</p
 	><ul
 	><li
-	  ><a href="#section.orphans"
+	  ><a href="#"
 	    >Orphan instances</a
 	    ></li
 	  ></ul
@@ -69,9 +70,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_OrphanInstances.html")
 	      ><span class="inst-left"
 		><span id="control.i:o:ic:AClass:AClass:1" class="instance expander" onclick="toggleSection('i:o:ic:AClass:AClass:1')"
 		  ></span
-		  > <a href="OrphanInstancesClass.html#t:AClass"
+		  > <a href="#"
 		  >AClass</a
-		  > <a href="OrphanInstancesType.html#t:AType"
+		  > <a href="#"
 		  >AType</a
 		  ></span
 		></td
@@ -87,11 +88,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_OrphanInstances.html")
 		  ><p class="caption"
 		    >Methods</p
 		    ><p class="src"
-		    ><a href="#v:aClass"
+		    ><a href="#"
 		      >aClass</a
-		      > :: <a href="OrphanInstancesType.html#t:AType"
+		      > :: <a href="#"
 		      >AType</a
-		      > -&gt; <a href="/opt/exp/ghc/roots/landing/share/doc/ghc/html/libraries/base-4.9.0.0/Data-Int.html#t:Int"
+		      > -&gt; <a href="#"
 		      >Int</a
 		      ></p
 		    ></div
@@ -103,11 +104,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_OrphanInstances.html")
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href="http://www.haskell.org/haddock/"
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/OrphanInstancesClass.html b/html-test/ref/OrphanInstancesClass.html
index 69ba33f8..871fe6c0 100644
--- a/html-test/ref/OrphanInstancesClass.html
+++ b/html-test/ref/OrphanInstancesClass.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >OrphanInstancesClass</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_OrphanInstancesClass.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_OrphanInstancesClass.html&quot;);};
+//
 </script
     ></head
   ><body
   ><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
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,7 +49,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_OrphanInstancesClass.h
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#t:AClass" id="t:AClass" class="def"
+	    > <a href="#" id="t:AClass" class="def"
 	    >AClass</a
 	    > a <span class="keyword"
 	    >where</span
@@ -57,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_OrphanInstancesClass.h
 	  ><p class="caption"
 	    >Minimal complete definition</p
 	    ><p class="src"
-	    ><a href="OrphanInstancesClass.html#v:aClass"
+	    ><a href="#"
 	      >aClass</a
 	      ></p
 	    ></div
@@ -65,9 +66,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_OrphanInstancesClass.h
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#v:aClass" id="v:aClass" class="def"
+	    ><a href="#" id="v:aClass" class="def"
 	      >aClass</a
-	      > :: a -&gt; <a href="/opt/exp/ghc/roots/landing/share/doc/ghc/html/libraries/base-4.9.0.0/Data-Int.html#t:Int"
+	      > :: a -&gt; <a href="#"
 	      >Int</a
 	      ></p
 	    ></div
@@ -75,11 +76,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_OrphanInstancesClass.h
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href="http://www.haskell.org/haddock/"
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/OrphanInstancesType.html b/html-test/ref/OrphanInstancesType.html
index 2652db73..0fc47009 100644
--- a/html-test/ref/OrphanInstancesType.html
+++ b/html-test/ref/OrphanInstancesType.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >OrphanInstancesType</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_OrphanInstancesType.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_OrphanInstancesType.html&quot;);};
+//
 </script
     ></head
   ><body
   ><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
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,7 +49,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_OrphanInstancesType.ht
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#t:AType" id="t:AType" class="def"
+	    > <a href="#" id="t:AType" class="def"
 	    >AType</a
 	    ></p
 	  ><div class="subs constructors"
@@ -57,13 +58,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_OrphanInstancesType.ht
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#v:AType" id="v:AType" class="def"
+		><a href="#" id="v:AType" class="def"
 		  >AType</a
-		  > <a href="/opt/exp/ghc/roots/landing/share/doc/ghc/html/libraries/base-4.9.0.0/Data-Int.html#t:Int"
+		  > <a href="#"
 		  >Int</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -71,11 +72,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_OrphanInstancesType.ht
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href="http://www.haskell.org/haddock/"
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/PatternSyns.html b/html-test/ref/PatternSyns.html
index 6fe8fff0..9347dfb8 100644
--- a/html-test/ref/PatternSyns.html
+++ b/html-test/ref/PatternSyns.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >PatternSyns</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -56,55 +57,63 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >FooType</a
-	    > x = <a href=""
+	    > x = <a href="#"
 	    >FooCtor</a
 	    > x</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a href=""
+	    > <a href="#"
 	    >Foo</a
-	    > ::   t -&gt; <a href=""
+	    > :: <span class="keyword"
+	    >forall</span
+	    > t. t -&gt; <a href="#"
 	    >FooType</a
 	    > t</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a href=""
+	    > <a href="#"
 	    >Bar</a
-	    > ::   t -&gt; <a href=""
+	    > :: <span class="keyword"
+	    >forall</span
+	    > t. t -&gt; <a href="#"
 	    >FooType</a
-	    > (<a href=""
+	    > (<a href="#"
 	    >FooType</a
 	    > t)</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a href=""
+	    > <a href="#"
 	    >(:&lt;-&gt;)</a
-	    > ::   t -&gt; t -&gt; (<a href=""
+	    > :: <span class="keyword"
+	    >forall</span
+	    > t t. t -&gt; t -&gt; (<a href="#"
 	    >FooType</a
-	    > t, <a href=""
+	    > t, <a href="#"
 	    >FooType</a
-	    > (<a href=""
+	    > (<a href="#"
 	    >FooType</a
 	    > t))</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a href=""
+	    > a <a href="#"
 	    >&gt;&lt;</a
-	    > b = <a href=""
+	    > b = <a href="#"
 	    >Empty</a
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a href=""
+	    > <a href="#"
 	    >E</a
-	    > ::   <a href=""
+	    > :: <span class="keyword"
+	    >forall</span
+	    > k t t. <a href="#"
 	    >(&gt;&lt;)</a
 	    > k t t</li
 	  ></ul
@@ -116,7 +125,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:FooType" class="def"
+	    > <a href="#" id="t:FooType" class="def"
 	    >FooType</a
 	    > x</p
 	  ><div class="doc"
@@ -129,11 +138,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:FooCtor" class="def"
+		><a href="#" id="v:FooCtor" class="def"
 		  >FooCtor</a
 		  > x</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -142,15 +151,17 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a href="" id="v:Foo" class="def"
+	    > <a href="#" id="v:Foo" class="def"
 	    >Foo</a
-	    > ::   t -&gt; <a href=""
+	    > :: <span class="keyword"
+	    >forall</span
+	    > t. t -&gt; <a href="#"
 	    >FooType</a
 	    > t</p
 	  ><div class="doc"
 	  ><p
 	    >Pattern synonym for <code
-	      ><a href=""
+	      ><a href="#"
 		>Foo</a
 		></code
 	      > x</p
@@ -160,17 +171,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a href="" id="v:Bar" class="def"
+	    > <a href="#" id="v:Bar" class="def"
 	    >Bar</a
-	    > ::   t -&gt; <a href=""
+	    > :: <span class="keyword"
+	    >forall</span
+	    > t. t -&gt; <a href="#"
 	    >FooType</a
-	    > (<a href=""
+	    > (<a href="#"
 	    >FooType</a
 	    > t)</p
 	  ><div class="doc"
 	  ><p
 	    >Pattern synonym for <code
-	      ><a href=""
+	      ><a href="#"
 		>Bar</a
 		></code
 	      > x</p
@@ -180,19 +193,21 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a href="" id="v::-60--45--62-" class="def"
+	    > <a href="#" id="v::-60--45--62-" class="def"
 	    >(:&lt;-&gt;)</a
-	    > ::   t -&gt; t -&gt; (<a href=""
+	    > :: <span class="keyword"
+	    >forall</span
+	    > t t. t -&gt; t -&gt; (<a href="#"
 	    >FooType</a
-	    > t, <a href=""
+	    > t, <a href="#"
 	    >FooType</a
-	    > (<a href=""
+	    > (<a href="#"
 	    >FooType</a
 	    > t))</p
 	  ><div class="doc"
 	  ><p
 	    >Pattern synonym for (<code
-	      ><a href=""
+	      ><a href="#"
 		>:&lt;-&gt;</a
 		></code
 	      >)</p
@@ -202,13 +217,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a href="" id="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
-	      ><a href=""
+	      ><a href="#"
 		>&gt;&lt;</a
 		></code
 	      >)</p
@@ -219,11 +234,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:Empty" class="def"
+		><a href="#" id="v:Empty" class="def"
 		  >Empty</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -232,15 +247,17 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a href="" id="v:E" class="def"
+	    > <a href="#" id="v:E" class="def"
 	    >E</a
-	    > ::   <a href=""
+	    > :: <span class="keyword"
+	    >forall</span
+	    > k t t. <a href="#"
 	    >(&gt;&lt;)</a
 	    > k t t</p
 	  ><div class="doc"
 	  ><p
 	    >Pattern for <code
-	      ><a href=""
+	      ><a href="#"
 		>Empty</a
 		></code
 	      ></p
@@ -249,11 +266,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_PatternSyns.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/PromotedTypes.html b/html-test/ref/PromotedTypes.html
index db42f637..7567d2f5 100644
--- a/html-test/ref/PromotedTypes.html
+++ b/html-test/ref/PromotedTypes.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >PromotedTypes</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_PromotedTypes.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_PromotedTypes.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,7 +49,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_PromotedTypes.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:RevList" class="def"
+	    > <a href="#" id="t:RevList" class="def"
 	    >RevList</a
 	    > a</p
 	  ><div class="subs constructors"
@@ -57,21 +58,21 @@ window.onload = function () {pageLoad();setSynopsis("mini_PromotedTypes.html");}
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:RNil" class="def"
+		><a href="#" id="v:RNil" class="def"
 		  >RNil</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		>(<a href=""
+		>(<a href="#"
 		  >RevList</a
-		  > a) <a href="" id="v::-62-" class="def"
+		  > a) <a href="#" id="v::-62-" class="def"
 		  >:&gt;</a
 		  > a</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -80,9 +81,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_PromotedTypes.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Pattern" class="def"
+	    > <a href="#" id="t:Pattern" class="def"
 	    >Pattern</a
-	    > :: [*] -&gt; * <span class="keyword"
+	    > :: [<a href="#"
+	    >*</a
+	    >] -&gt; <a href="#"
+	    >*</a
+	    > <span class="keyword"
 	    >where</span
 	    ></p
 	  ><div class="subs constructors"
@@ -91,27 +96,27 @@ window.onload = function () {pageLoad();setSynopsis("mini_PromotedTypes.html");}
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:Nil" class="def"
+		><a href="#" id="v:Nil" class="def"
 		  >Nil</a
-		  > ::  <a href=""
+		  > :: <a href="#"
 		  >Pattern</a
 		  > '[]</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:Cons" class="def"
+		><a href="#" id="v:Cons" class="def"
 		  >Cons</a
-		  > ::  <a href=""
+		  > :: <a href="#"
 		  >Maybe</a
-		  > h -&gt; <a href=""
+		  > h -&gt; <a href="#"
 		  >Pattern</a
-		  > t -&gt; <a href=""
+		  > t -&gt; <a href="#"
 		  >Pattern</a
 		  > (h ': t)</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -120,11 +125,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_PromotedTypes.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:RevPattern" class="def"
+	    > <a href="#" id="t:RevPattern" class="def"
 	    >RevPattern</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >RevList</a
-	    > * -&gt; * <span class="keyword"
+	    > <a href="#"
+	    >*</a
+	    > -&gt; <a href="#"
+	    >*</a
+	    > <span class="keyword"
 	    >where</span
 	    ></p
 	  ><div class="subs constructors"
@@ -133,31 +142,31 @@ window.onload = function () {pageLoad();setSynopsis("mini_PromotedTypes.html");}
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:RevNil" class="def"
+		><a href="#" id="v:RevNil" class="def"
 		  >RevNil</a
-		  > ::  <a href=""
+		  > :: <a href="#"
 		  >RevPattern</a
-		  > <a href=""
+		  > <a href="#"
 		  >RNil</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:RevCons" class="def"
+		><a href="#" id="v:RevCons" class="def"
 		  >RevCons</a
-		  > ::  <a href=""
+		  > :: <a href="#"
 		  >Maybe</a
-		  > h -&gt; <a href=""
+		  > h -&gt; <a href="#"
 		  >RevPattern</a
-		  > t -&gt; <a href=""
+		  > t -&gt; <a href="#"
 		  >RevPattern</a
-		  > (t <a href=""
+		  > (t <a href="#"
 		  >:&gt;</a
 		  > h)</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -166,9 +175,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_PromotedTypes.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Tuple" class="def"
+	    > <a href="#" id="t:Tuple" class="def"
 	    >Tuple</a
-	    > :: (*, *) -&gt; * <span class="keyword"
+	    > :: (<a href="#"
+	    >*</a
+	    >, <a href="#"
+	    >*</a
+	    >) -&gt; <a href="#"
+	    >*</a
+	    > <span class="keyword"
 	    >where</span
 	    ></p
 	  ><div class="subs constructors"
@@ -177,13 +192,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_PromotedTypes.html");}
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:Tuple" class="def"
+		><a href="#" id="v:Tuple" class="def"
 		  >Tuple</a
-		  > ::  a -&gt; b -&gt; <a href=""
+		  > :: a -&gt; b -&gt; <a href="#"
 		  >Tuple</a
 		  > '(a, b)</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -191,11 +206,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_PromotedTypes.html");}
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Properties.html b/html-test/ref/Properties.html
index 5d2e58c0..e24d6265 100644
--- a/html-test/ref/Properties.html
+++ b/html-test/ref/Properties.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Properties</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Properties.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Properties.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,11 +47,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Properties.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >fib</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Integer</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >Integer</a
 	    ></li
 	  ></ul
@@ -60,17 +61,17 @@ window.onload = function () {pageLoad();setSynopsis("mini_Properties.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:fib" class="def"
+	  ><a href="#" id="v:fib" class="def"
 	    >fib</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Integer</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >Integer</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Fibonacci number of given <code
-	      ><a href=""
+	      ><a href="#"
 		>Integer</a
 		></code
 	      >.</p
@@ -81,11 +82,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Properties.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/PruneWithWarning.html b/html-test/ref/PruneWithWarning.html
index bbf21f42..0ee2b104 100644
--- a/html-test/ref/PruneWithWarning.html
+++ b/html-test/ref/PruneWithWarning.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >PruneWithWarning</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_PruneWithWarning.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_PruneWithWarning.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -60,11 +61,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_PruneWithWarning.html"
       ></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/QuasiExpr.html b/html-test/ref/QuasiExpr.html
index 41129d59..45371eb9 100644
--- a/html-test/ref/QuasiExpr.html
+++ b/html-test/ref/QuasiExpr.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >QuasiExpr</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,7 +49,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Expr" class="def"
+	    > <a href="#" id="t:Expr" class="def"
 	    >Expr</a
 	    ></p
 	  ><div class="subs constructors"
@@ -57,47 +58,47 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:IntExpr" class="def"
+		><a href="#" id="v:IntExpr" class="def"
 		  >IntExpr</a
-		  > <a href=""
+		  > <a href="#"
 		  >Integer</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:AntiIntExpr" class="def"
+		><a href="#" id="v:AntiIntExpr" class="def"
 		  >AntiIntExpr</a
-		  > <a href=""
+		  > <a href="#"
 		  >String</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:BinopExpr" class="def"
+		><a href="#" id="v:BinopExpr" class="def"
 		  >BinopExpr</a
-		  > <a href=""
+		  > <a href="#"
 		  >BinOp</a
-		  > <a href=""
+		  > <a href="#"
 		  >Expr</a
-		  > <a href=""
+		  > <a href="#"
 		  >Expr</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:AntiExpr" class="def"
+		><a href="#" id="v:AntiExpr" class="def"
 		  >AntiExpr</a
-		  > <a href=""
+		  > <a href="#"
 		  >String</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -111,14 +112,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:id:Expr:Show:1" class="instance expander" onclick="toggleSection('i:id:Expr:Show:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Show</a
-		      > <a href=""
+		      > <a href="#"
 		      >Expr</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td colspan="2"
@@ -127,29 +128,29 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >showsPrec</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Int</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >Expr</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >ShowS</a
 			  ></p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >show</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Expr</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >String</a
 			  ></p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >showList</a
-			  > :: [<a href=""
+			  > :: [<a href="#"
 			  >Expr</a
-			  >] -&gt; <a href=""
+			  >] -&gt; <a href="#"
 			  >ShowS</a
 			  ></p
 			></div
@@ -164,7 +165,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:BinOp" class="def"
+	    > <a href="#" id="t:BinOp" class="def"
 	    >BinOp</a
 	    ></p
 	  ><div class="subs constructors"
@@ -173,35 +174,35 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:AddOp" class="def"
+		><a href="#" id="v:AddOp" class="def"
 		  >AddOp</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:SubOp" class="def"
+		><a href="#" id="v:SubOp" class="def"
 		  >SubOp</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:MulOp" class="def"
+		><a href="#" id="v:MulOp" class="def"
 		  >MulOp</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:DivOp" class="def"
+		><a href="#" id="v:DivOp" class="def"
 		  >DivOp</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -215,14 +216,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:id:BinOp:Show:1" class="instance expander" onclick="toggleSection('i:id:BinOp:Show:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Show</a
-		      > <a href=""
+		      > <a href="#"
 		      >BinOp</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td colspan="2"
@@ -231,29 +232,29 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >showsPrec</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Int</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >BinOp</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >ShowS</a
 			  ></p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >show</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >BinOp</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >String</a
 			  ></p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >showList</a
-			  > :: [<a href=""
+			  > :: [<a href="#"
 			  >BinOp</a
-			  >] -&gt; <a href=""
+			  >] -&gt; <a href="#"
 			  >ShowS</a
 			  ></p
 			></div
@@ -266,36 +267,32 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiExpr.html");};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:eval" class="def"
+	  ><a href="#" id="v:eval" class="def"
 	    >eval</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Expr</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >Integer</a
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:expr" class="def"
+	  ><a href="#" id="v:expr" class="def"
 	    >expr</a
 	    > :: QuasiQuoter</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:parseExprExp" class="def"
+	  ><a href="#" id="v:parseExprExp" class="def"
 	    >parseExprExp</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >String</a
 	    > -&gt; Q Exp</p
 	  ></div
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/QuasiQuote.html b/html-test/ref/QuasiQuote.html
index 610f5edf..ad23b77d 100644
--- a/html-test/ref/QuasiQuote.html
+++ b/html-test/ref/QuasiQuote.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >QuasiQuote</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_QuasiQuote.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiQuote.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,20 +47,16 @@ window.onload = function () {pageLoad();setSynopsis("mini_QuasiQuote.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:val" class="def"
+	  ><a href="#" id="v:val" class="def"
 	    >val</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Integer</a
 	    ></p
 	  ></div
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index 1cae5ba1..243ab30b 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >SpuriousSuperclassConstraints</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_SpuriousSuperclassConstraints.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_SpuriousSuperclassConstraints.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -51,13 +52,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_SpuriousSuperclassCons
 	  >Due to a change in GHC 7.6.1 we had a bug that superclass contraints were
  included in the instances list.  Edward K. repported it here:</p
 	  ><p
-	  ><a href=""
+	  ><a href="#"
 	    >http://www.haskell.org/pipermail/haskell-cafe/2012-September/103600.html</a
 	    ></p
 	  ><p
 	  >And here is the corresponding theard on glasgow-haskell-users:</p
 	  ><p
-	  ><a href=""
+	  ><a href="#"
 	    >http://www.haskell.org/pipermail/glasgow-haskell-users/2012-September/022914.html</a
 	    ></p
 	  ><p
@@ -74,7 +75,7 @@ Fix spurious superclass constraints bug.</pre
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:SomeType" class="def"
+	    > <a href="#" id="t:SomeType" class="def"
 	    >SomeType</a
 	    > f a</p
 	  ><div class="subs instances"
@@ -87,14 +88,14 @@ Fix spurious superclass constraints bug.</pre
 		  ><span class="inst-left"
 		    ><span id="control.i:id:SomeType:Functor:1" class="instance expander" onclick="toggleSection('i:id:SomeType:Functor:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Functor</a
-		      > (<a href=""
+		      > (<a href="#"
 		      >SomeType</a
 		      > f)</span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td colspan="2"
@@ -103,19 +104,19 @@ Fix spurious superclass constraints bug.</pre
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >fmap</a
-			  > :: (a -&gt; b) -&gt; <a href=""
+			  > :: (a -&gt; b) -&gt; <a href="#"
 			  >SomeType</a
-			  > f a -&gt; <a href=""
+			  > f a -&gt; <a href="#"
 			  >SomeType</a
 			  > f b</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >(&lt;$)</a
-			  > :: a -&gt; <a href=""
+			  > :: a -&gt; <a href="#"
 			  >SomeType</a
-			  > f b -&gt; <a href=""
+			  > f b -&gt; <a href="#"
 			  >SomeType</a
 			  > f a</p
 			></div
@@ -127,16 +128,16 @@ Fix spurious superclass constraints bug.</pre
 		  ><span class="inst-left"
 		    ><span id="control.i:id:SomeType:Applicative:2" class="instance expander" onclick="toggleSection('i:id:SomeType:Applicative:2')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Applicative</a
-		      > f =&gt; <a href=""
+		      > f =&gt; <a href="#"
 		      >Applicative</a
-		      > (<a href=""
+		      > (<a href="#"
 		      >SomeType</a
 		      > f)</span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td colspan="2"
@@ -145,39 +146,39 @@ Fix spurious superclass constraints bug.</pre
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >pure</a
-			  > :: a -&gt; <a href=""
+			  > :: a -&gt; <a href="#"
 			  >SomeType</a
 			  > f a</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >(&lt;*&gt;)</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >SomeType</a
-			  > f (a -&gt; b) -&gt; <a href=""
+			  > f (a -&gt; b) -&gt; <a href="#"
 			  >SomeType</a
-			  > f a -&gt; <a href=""
+			  > f a -&gt; <a href="#"
 			  >SomeType</a
 			  > f b</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >(*&gt;)</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >SomeType</a
-			  > f a -&gt; <a href=""
+			  > f a -&gt; <a href="#"
 			  >SomeType</a
-			  > f b -&gt; <a href=""
+			  > f b -&gt; <a href="#"
 			  >SomeType</a
 			  > f b</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >(&lt;*)</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >SomeType</a
-			  > f a -&gt; <a href=""
+			  > f a -&gt; <a href="#"
 			  >SomeType</a
-			  > f b -&gt; <a href=""
+			  > f b -&gt; <a href="#"
 			  >SomeType</a
 			  > f a</p
 			></div
@@ -191,11 +192,7 @@ Fix spurious superclass constraints bug.</pre
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/TH.html b/html-test/ref/TH.html
index e72c2189..f142479c 100644
--- a/html-test/ref/TH.html
+++ b/html-test/ref/TH.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >TH</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_TH.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_TH.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,18 +47,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_TH.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:decl" class="def"
+	  ><a href="#" id="v:decl" class="def"
 	    >decl</a
 	    > :: Q [Dec]</p
 	  ></div
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/TH2.html b/html-test/ref/TH2.html
index cf896bac..07b2c7d4 100644
--- a/html-test/ref/TH2.html
+++ b/html-test/ref/TH2.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >TH2</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_TH2.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_TH2.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,18 +47,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_TH2.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:f" class="def"
+	  ><a href="#" id="v:f" class="def"
 	    >f</a
 	    > :: t -&gt; t</p
 	  ></div
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index 8b82fe0b..6fb34801 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Test</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -76,53 +77,53 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	>Contents</p
 	><ul
 	><li
-	  ><a href=""
+	  ><a href="#"
 	    >Type declarations</a
 	    ><ul
 	    ><li
-	      ><a href=""
+	      ><a href="#"
 		>Data types</a
 		></li
 	      ><li
-	      ><a href=""
+	      ><a href="#"
 		>Records</a
 		></li
 	      ></ul
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >Class declarations</a
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >Function types</a
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >Auxiliary stuff</a
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >A hidden module</a
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >A visible module</a
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >Existential / Universal types</a
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >Type signatures with argument docs</a
 	    ></li
 	  ><li
-	  ><a href=""
+	  ><a href="#"
 	    >A section</a
 	    ><ul
 	    ><li
-	      ><a href=""
+	      ><a href="#"
 		>A subsection</a
 		></li
 	      ></ul
@@ -136,19 +137,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p
 	  >This module illustrates &amp; tests most of the features of Haddock.
  Testing references from the description: <code
-	    ><a href=""
+	    ><a href="#"
 	      >T</a
 	      ></code
 	    >, <code
-	    ><a href=""
+	    ><a href="#"
 	      >f</a
 	      ></code
 	    >, <code
-	    ><a href=""
+	    ><a href="#"
 	      >g</a
 	      ></code
 	    >, <code
-	    ><a href=""
+	    ><a href="#"
 	      >visible</a
 	      ></code
 	    >.</p
@@ -161,29 +162,29 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >T</a
 	    > a b<ul class="subs"
 	    ><li
-	      >= <a href=""
+	      >= <a href="#"
 		>A</a
-		> <a href=""
+		> <a href="#"
 		>Int</a
-		> (<a href=""
+		> (<a href="#"
 		>Maybe</a
-		> <a href=""
+		> <a href="#"
 		>Float</a
 		>)</li
 	      ><li
-	      >| <a href=""
+	      >| <a href="#"
 		>B</a
-		> (<a href=""
+		> (<a href="#"
 		>T</a
-		> a b, <a href=""
+		> a b, <a href="#"
 		>T</a
-		> <a href=""
+		> <a href="#"
 		>Int</a
-		> <a href=""
+		> <a href="#"
 		>Float</a
 		>)</li
 	      ></ul
@@ -191,21 +192,21 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >T2</a
 	    > a b</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >T3</a
 	    > a b<ul class="subs"
 	    ><li
-	      >= <a href=""
+	      >= <a href="#"
 		>A1</a
 		> a</li
 	      ><li
-	      >| <a href=""
+	      >| <a href="#"
 		>B1</a
 		> b</li
 	      ></ul
@@ -213,15 +214,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >T4</a
 	    > a b<ul class="subs"
 	    ><li
-	      >= <a href=""
+	      >= <a href="#"
 		>A2</a
 		> a</li
 	      ><li
-	      >| <a href=""
+	      >| <a href="#"
 		>B2</a
 		> b</li
 	      ></ul
@@ -229,15 +230,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >T5</a
 	    > a b<ul class="subs"
 	    ><li
-	      >= <a href=""
+	      >= <a href="#"
 		>A3</a
 		> a</li
 	      ><li
-	      >| <a href=""
+	      >| <a href="#"
 		>B3</a
 		> b</li
 	      ></ul
@@ -245,19 +246,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >T6</a
 	    ><ul class="subs"
 	    ><li
-	      >= <a href=""
+	      >= <a href="#"
 		>A4</a
 		></li
 	      ><li
-	      >| <a href=""
+	      >| <a href="#"
 		>B4</a
 		></li
 	      ><li
-	      >| <a href=""
+	      >| <a href="#"
 		>C4</a
 		></li
 	      ></ul
@@ -265,21 +266,21 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href=""
+	    > <a href="#"
 	    >N1</a
-	    > a = <a href=""
+	    > a = <a href="#"
 	    >N1</a
 	    > a</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href=""
+	    > <a href="#"
 	    >N2</a
-	    > a b = <a href=""
+	    > a b = <a href="#"
 	    >N2</a
 	    > {<ul class="subs"
 	    ><li
-	      ><a href=""
+	      ><a href="#"
 		>n</a
 		> :: a b</li
 	      ></ul
@@ -287,13 +288,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href=""
+	    > <a href="#"
 	    >N3</a
-	    > a b = <a href=""
+	    > a b = <a href="#"
 	    >N3</a
 	    > {<ul class="subs"
 	    ><li
-	      ><a href=""
+	      ><a href="#"
 		>n3</a
 		> :: a b</li
 	      ></ul
@@ -301,19 +302,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >N4</a
 	    > a b</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href=""
+	    > <a href="#"
 	    >N5</a
-	    > a b = <a href=""
+	    > a b = <a href="#"
 	    >N5</a
 	    > {<ul class="subs"
 	    ><li
-	      ><a href=""
+	      ><a href="#"
 		>n5</a
 		> :: a b</li
 	      ></ul
@@ -321,13 +322,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href=""
+	    > <a href="#"
 	    >N6</a
-	    > a b = <a href=""
+	    > a b = <a href="#"
 	    >N6</a
 	    > {<ul class="subs"
 	    ><li
-	      ><a href=""
+	      ><a href="#"
 		>n6</a
 		> :: a b</li
 	      ></ul
@@ -335,13 +336,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href=""
+	    > <a href="#"
 	    >N7</a
-	    > a b = <a href=""
+	    > a b = <a href="#"
 	    >N7</a
 	    > {<ul class="subs"
 	    ><li
-	      ><a href=""
+	      ><a href="#"
 		>n7</a
 		> :: a b</li
 	      ></ul
@@ -349,69 +350,69 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >R</a
 	    ><ul class="subs"
 	    ><li
-	      >= <a href=""
+	      >= <a href="#"
 		>C1</a
 		> { <ul class="subs"
 		><li
-		  ><a href=""
+		  ><a href="#"
 		    >p</a
-		    > :: <a href=""
+		    > :: <a href="#"
 		    >Int</a
 		    ></li
 		  ><li
-		  ><a href=""
+		  ><a href="#"
 		    >q</a
 		    > :: <span class="keyword"
 		    >forall</span
 		    > a. a -&gt; a</li
 		  ><li
-		  ><a href=""
+		  ><a href="#"
 		    >r</a
-		    >, <a href=""
+		    >, <a href="#"
 		    >s</a
-		    > :: <a href=""
+		    > :: <a href="#"
 		    >Int</a
 		    ></li
 		  ></ul
 		> }</li
 	      ><li
-	      >| <a href=""
+	      >| <a href="#"
 		>C2</a
 		> { <ul class="subs"
 		><li
-		  ><a href=""
+		  ><a href="#"
 		    >t</a
-		    > :: T1 -&gt; <a href=""
+		    > :: T1 -&gt; <a href="#"
 		    >T2</a
-		    > <a href=""
+		    > <a href="#"
 		    >Int</a
-		    > <a href=""
+		    > <a href="#"
 		    >Int</a
-		    > -&gt; <a href=""
+		    > -&gt; <a href="#"
 		    >T3</a
-		    > <a href=""
+		    > <a href="#"
 		    >Bool</a
-		    > <a href=""
+		    > <a href="#"
 		    >Bool</a
-		    > -&gt; <a href=""
+		    > -&gt; <a href="#"
 		    >T4</a
-		    > <a href=""
+		    > <a href="#"
 		    >Float</a
-		    > <a href=""
+		    > <a href="#"
 		    >Float</a
-		    > -&gt; <a href=""
+		    > -&gt; <a href="#"
 		    >T5</a
 		    > () ()</li
 		  ><li
-		  ><a href=""
+		  ><a href="#"
 		    >u</a
-		    >, <a href=""
+		    >, <a href="#"
 		    >v</a
-		    > :: <a href=""
+		    > :: <a href="#"
 		    >Int</a
 		    ></li
 		  ></ul
@@ -421,27 +422,27 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >R1</a
-	    > = <a href=""
+	    > = <a href="#"
 	    >C3</a
 	    > {<ul class="subs"
 	    ><li
-	      ><a href=""
+	      ><a href="#"
 		>s1</a
-		> :: <a href=""
+		> :: <a href="#"
 		>Int</a
 		></li
 	      ><li
-	      ><a href=""
+	      ><a href="#"
 		>s2</a
-		> :: <a href=""
+		> :: <a href="#"
 		>Int</a
 		></li
 	      ><li
-	      ><a href=""
+	      ><a href="#"
 		>s3</a
-		> :: <a href=""
+		> :: <a href="#"
 		>Int</a
 		></li
 	      ></ul
@@ -449,123 +450,101 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href=""
+	    > <a href="#"
 	    >D</a
-	    > a =&gt; <a href=""
+	    > a =&gt; <a href="#"
 	    >C</a
 	    > a <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
-	    ><li
-	      ><a href=""
-		>a</a
-		> :: <a href=""
-		>IO</a
-		> a</li
-	      ><li
-	      ><a href=""
-		>b</a
-		> :: [a]</li
-	      ></ul
+	    ></ul
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href=""
+	    > <a href="#"
 	    >D</a
 	    > a <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
-	    ><li
-	      ><a href=""
-		>d</a
-		> :: <a href=""
-		>T</a
-		> a b</li
-	      ><li
-	      ><a href=""
-		>e</a
-		> :: (a, a)</li
-	      ></ul
+	    ></ul
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href=""
+	    > <a href="#"
 	    >E</a
 	    > a</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href=""
+	    > <a href="#"
 	    >F</a
 	    > a <span class="keyword"
 	    >where</span
 	    ><ul class="subs"
-	    ><li
-	      ><a href=""
-		>ff</a
-		> :: a</li
-	      ></ul
+	    ></ul
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
+	    >a</a
+	    > :: <a href="#"
+	    >C</a
+	    > a =&gt; <a href="#"
+	    >IO</a
+	    > a</li
+	  ><li class="src short"
+	  ><a href="#"
 	    >f</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >C</a
-	    > a =&gt; a -&gt; <a href=""
+	    > a =&gt; a -&gt; <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >g</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >IO</a
 	    > CInt</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >hidden</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  >module <a href=""
+	  >module <a href="#"
 	    >Visible</a
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >Ex</a
 	    > a<ul class="subs"
 	    ><li
-	      >= <span class="keyword"
-		>forall</span
-		> b . <a href=""
+	      >= <a href="#"
 		>C</a
-		> b =&gt; <a href=""
+		> b =&gt; <a href="#"
 		>Ex1</a
 		> b</li
 	      ><li
-	      >| <span class="keyword"
-		>forall</span
-		> b . <a href=""
+	      >| <a href="#"
 		>Ex2</a
 		> b</li
 	      ><li
-	      >| <span class="keyword"
-		>forall</span
-		> b . <a href=""
+	      >| <a href="#"
 		>C</a
-		> a =&gt; <a href=""
+		> a =&gt; <a href="#"
 		>Ex3</a
 		> b</li
 	      ><li
-	      >| <a href=""
+	      >| <a href="#"
 		>Ex4</a
 		> (<span class="keyword"
 		>forall</span
@@ -573,83 +552,83 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	      ></ul
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >k</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >T</a
-	    > () () -&gt; <a href=""
+	    > () () -&gt; <a href="#"
 	    >T2</a
-	    > <a href=""
+	    > <a href="#"
 	    >Int</a
-	    > <a href=""
+	    > <a href="#"
 	    >Int</a
-	    > -&gt; (<a href=""
+	    > -&gt; (<a href="#"
 	    >T3</a
-	    > <a href=""
+	    > <a href="#"
 	    >Bool</a
-	    > <a href=""
+	    > <a href="#"
 	    >Bool</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >T4</a
-	    > <a href=""
+	    > <a href="#"
 	    >Float</a
-	    > <a href=""
+	    > <a href="#"
 	    >Float</a
-	    >) -&gt; <a href=""
+	    >) -&gt; <a href="#"
 	    >T5</a
-	    > () () -&gt; <a href=""
+	    > () () -&gt; <a href="#"
 	    >IO</a
 	    > ()</li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >l</a
-	    > :: (<a href=""
+	    > :: (<a href="#"
 	    >Int</a
-	    >, <a href=""
+	    >, <a href="#"
 	    >Int</a
-	    >, <a href=""
+	    >, <a href="#"
 	    >Float</a
-	    >) -&gt; <a href=""
+	    >) -&gt; <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >m</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >R</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >N1</a
-	    > () -&gt; <a href=""
+	    > () -&gt; <a href="#"
 	    >IO</a
-	    > <a href=""
+	    > <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >o</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Float</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >IO</a
-	    > <a href=""
+	    > <a href="#"
 	    >Float</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >f'</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >withType</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >withoutType</a
-	    > :: t</li
+	    > :: a</li
 	  ></ul
 	></div
       ><div id="interface"
@@ -661,7 +640,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:T" class="def"
+	    > <a href="#" id="t:T" class="def"
 	    >T</a
 	    > a b</p
 	  ><div class="doc"
@@ -677,19 +656,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:A" class="def"
+		><a href="#" id="v:A" class="def"
 		  >A</a
-		  > <a href=""
+		  > <a href="#"
 		  >Int</a
-		  > (<a href=""
+		  > (<a href="#"
 		  >Maybe</a
-		  > <a href=""
+		  > <a href="#"
 		  >Float</a
 		  >)</td
 		><td class="doc"
 		><p
 		  >This comment describes the <code
-		    ><a href=""
+		    ><a href="#"
 		      >A</a
 		      ></code
 		    > constructor</p
@@ -697,21 +676,21 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:B" class="def"
+		><a href="#" id="v:B" class="def"
 		  >B</a
-		  > (<a href=""
+		  > (<a href="#"
 		  >T</a
-		  > a b, <a href=""
+		  > a b, <a href="#"
 		  >T</a
-		  > <a href=""
+		  > <a href="#"
 		  >Int</a
-		  > <a href=""
+		  > <a href="#"
 		  >Float</a
 		  >)</td
 		><td class="doc"
 		><p
 		  >This comment describes the <code
-		    ><a href=""
+		    ><a href="#"
 		      >B</a
 		      ></code
 		    > constructor</p
@@ -724,7 +703,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:T2" class="def"
+	    > <a href="#" id="t:T2" class="def"
 	    >T2</a
 	    > a b</p
 	  ><div class="doc"
@@ -736,7 +715,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:T3" class="def"
+	    > <a href="#" id="t:T3" class="def"
 	    >T3</a
 	    > a b</p
 	  ><div class="doc"
@@ -749,19 +728,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:A1" class="def"
+		><a href="#" id="v:A1" class="def"
 		  >A1</a
 		  > a</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:B1" class="def"
+		><a href="#" id="v:B1" class="def"
 		  >B1</a
 		  > b</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -770,7 +749,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:T4" class="def"
+	    > <a href="#" id="t:T4" class="def"
 	    >T4</a
 	    > a b</p
 	  ><div class="subs constructors"
@@ -779,19 +758,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:A2" class="def"
+		><a href="#" id="v:A2" class="def"
 		  >A2</a
 		  > a</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:B2" class="def"
+		><a href="#" id="v:B2" class="def"
 		  >B2</a
 		  > b</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -800,7 +779,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:T5" class="def"
+	    > <a href="#" id="t:T5" class="def"
 	    >T5</a
 	    > a b</p
 	  ><div class="subs constructors"
@@ -809,13 +788,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:A3" class="def"
+		><a href="#" id="v:A3" class="def"
 		  >A3</a
 		  > a</td
 		><td class="doc"
 		><p
 		  >documents <code
-		    ><a href=""
+		    ><a href="#"
 		      >A3</a
 		      ></code
 		    ></p
@@ -823,13 +802,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:B3" class="def"
+		><a href="#" id="v:B3" class="def"
 		  >B3</a
 		  > b</td
 		><td class="doc"
 		><p
 		  >documents <code
-		    ><a href=""
+		    ><a href="#"
 		      >B3</a
 		      ></code
 		    ></p
@@ -842,7 +821,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:T6" class="def"
+	    > <a href="#" id="t:T6" class="def"
 	    >T6</a
 	    ></p
 	  ><div class="doc"
@@ -855,13 +834,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:A4" class="def"
+		><a href="#" id="v:A4" class="def"
 		  >A4</a
 		  ></td
 		><td class="doc"
 		><p
 		  >This is the doc for <code
-		    ><a href=""
+		    ><a href="#"
 		      >A4</a
 		      ></code
 		    ></p
@@ -869,13 +848,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:B4" class="def"
+		><a href="#" id="v:B4" class="def"
 		  >B4</a
 		  ></td
 		><td class="doc"
 		><p
 		  >This is the doc for <code
-		    ><a href=""
+		    ><a href="#"
 		      >B4</a
 		      ></code
 		    ></p
@@ -883,13 +862,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:C4" class="def"
+		><a href="#" id="v:C4" class="def"
 		  >C4</a
 		  ></td
 		><td class="doc"
 		><p
 		  >This is the doc for <code
-		    ><a href=""
+		    ><a href="#"
 		      >C4</a
 		      ></code
 		    ></p
@@ -902,7 +881,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="" id="t:N1" class="def"
+	    > <a href="#" id="t:N1" class="def"
 	    >N1</a
 	    > a</p
 	  ><div class="doc"
@@ -915,11 +894,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:N1" class="def"
+		><a href="#" id="v:N1" class="def"
 		  >N1</a
 		  > a</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -928,7 +907,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="" id="t:N2" class="def"
+	    > <a href="#" id="t:N2" class="def"
 	    >N2</a
 	    > a b</p
 	  ><div class="doc"
@@ -941,11 +920,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:N2" class="def"
+		><a href="#" id="v:N2" class="def"
 		  >N2</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td colspan="2"
@@ -955,11 +934,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:n" class="def"
+			><a href="#" id="v:n" class="def"
 			  >n</a
 			  > :: a b</dfn
 			><div class="doc empty"
-			>&nbsp;</div
+			></div
 			></li
 		      ></ul
 		    ></div
@@ -972,7 +951,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="" id="t:N3" class="def"
+	    > <a href="#" id="t:N3" class="def"
 	    >N3</a
 	    > a b</p
 	  ><div class="doc"
@@ -985,11 +964,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:N3" class="def"
+		><a href="#" id="v:N3" class="def"
 		  >N3</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td colspan="2"
@@ -999,13 +978,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:n3" class="def"
+			><a href="#" id="v:n3" class="def"
 			  >n3</a
 			  > :: a b</dfn
 			><div class="doc"
 			><p
 			  >this is the <code
-			    ><a href=""
+			    ><a href="#"
 			      >n3</a
 			      ></code
 			    > field</p
@@ -1022,7 +1001,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:N4" class="def"
+	    > <a href="#" id="t:N4" class="def"
 	    >N4</a
 	    > a b</p
 	  ><div class="doc"
@@ -1035,7 +1014,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="" id="t:N5" class="def"
+	    > <a href="#" id="t:N5" class="def"
 	    >N5</a
 	    > a b</p
 	  ><div class="subs constructors"
@@ -1044,11 +1023,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:N5" class="def"
+		><a href="#" id="v:N5" class="def"
 		  >N5</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td colspan="2"
@@ -1058,7 +1037,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:n5" class="def"
+			><a href="#" id="v:n5" class="def"
 			  >n5</a
 			  > :: a b</dfn
 			><div class="doc"
@@ -1077,7 +1056,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="" id="t:N6" class="def"
+	    > <a href="#" id="t:N6" class="def"
 	    >N6</a
 	    > a b</p
 	  ><div class="subs constructors"
@@ -1086,7 +1065,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:N6" class="def"
+		><a href="#" id="v:N6" class="def"
 		  >N6</a
 		  ></td
 		><td class="doc"
@@ -1102,11 +1081,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:n6" class="def"
+			><a href="#" id="v:n6" class="def"
 			  >n6</a
 			  > :: a b</dfn
 			><div class="doc empty"
-			>&nbsp;</div
+			></div
 			></li
 		      ></ul
 		    ></div
@@ -1119,7 +1098,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="" id="t:N7" class="def"
+	    > <a href="#" id="t:N7" class="def"
 	    >N7</a
 	    > a b</p
 	  ><div class="doc"
@@ -1132,13 +1111,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:N7" class="def"
+		><a href="#" id="v:N7" class="def"
 		  >N7</a
 		  ></td
 		><td class="doc"
 		><p
 		  >The <code
-		    ><a href=""
+		    ><a href="#"
 		      >N7</a
 		      ></code
 		    > constructor</p
@@ -1152,11 +1131,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:n7" class="def"
+			><a href="#" id="v:n7" class="def"
 			  >n7</a
 			  > :: a b</dfn
 			><div class="doc empty"
-			>&nbsp;</div
+			></div
 			></li
 		      ></ul
 		    ></div
@@ -1171,30 +1150,30 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:R" class="def"
+	    > <a href="#" id="t:R" class="def"
 	    >R</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >This is the documentation for the <code
-	      ><a href=""
+	      ><a href="#"
 		>R</a
 		></code
 	      > record, which has four fields,
  <code
-	      ><a href=""
+	      ><a href="#"
 		>p</a
 		></code
 	      >, <code
-	      ><a href=""
+	      ><a href="#"
 		>q</a
 		></code
 	      >, <code
-	      ><a href=""
+	      ><a href="#"
 		>r</a
 		></code
 	      >, and <code
-	      ><a href=""
+	      ><a href="#"
 		>s</a
 		></code
 	      >.</p
@@ -1205,13 +1184,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:C1" class="def"
+		><a href="#" id="v:C1" class="def"
 		  >C1</a
 		  ></td
 		><td class="doc"
 		><p
 		  >This is the <code
-		    ><a href=""
+		    ><a href="#"
 		      >C1</a
 		      ></code
 		    > record constructor, with the following fields:</p
@@ -1225,15 +1204,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:p" class="def"
+			><a href="#" id="v:p" class="def"
 			  >p</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Int</a
 			  ></dfn
 			><div class="doc"
 			><p
 			  >This comment applies to the <code
-			    ><a href=""
+			    ><a href="#"
 			      >p</a
 			      ></code
 			    > field</p
@@ -1241,7 +1220,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="" id="v:q" class="def"
+			><a href="#" id="v:q" class="def"
 			  >q</a
 			  > :: <span class="keyword"
 			  >forall</span
@@ -1249,7 +1228,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			><div class="doc"
 			><p
 			  >This comment applies to the <code
-			    ><a href=""
+			    ><a href="#"
 			      >q</a
 			      ></code
 			    > field</p
@@ -1257,21 +1236,21 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="" id="v:r" class="def"
+			><a href="#" id="v:r" class="def"
 			  >r</a
-			  >, <a href="" id="v:s" class="def"
+			  >, <a href="#" id="v:s" class="def"
 			  >s</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Int</a
 			  ></dfn
 			><div class="doc"
 			><p
 			  >This comment applies to both <code
-			    ><a href=""
+			    ><a href="#"
 			      >r</a
 			      ></code
 			    > and <code
-			    ><a href=""
+			    ><a href="#"
 			      >s</a
 			      ></code
 			    ></p
@@ -1283,13 +1262,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:C2" class="def"
+		><a href="#" id="v:C2" class="def"
 		  >C2</a
 		  ></td
 		><td class="doc"
 		><p
 		  >This is the <code
-		    ><a href=""
+		    ><a href="#"
 		      >C2</a
 		      ></code
 		    > record constructor, also with some fields:</p
@@ -1303,43 +1282,43 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:t" class="def"
+			><a href="#" id="v:t" class="def"
 			  >t</a
-			  > :: T1 -&gt; <a href=""
+			  > :: T1 -&gt; <a href="#"
 			  >T2</a
-			  > <a href=""
+			  > <a href="#"
 			  >Int</a
-			  > <a href=""
+			  > <a href="#"
 			  >Int</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >T3</a
-			  > <a href=""
+			  > <a href="#"
 			  >Bool</a
-			  > <a href=""
+			  > <a href="#"
 			  >Bool</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >T4</a
-			  > <a href=""
+			  > <a href="#"
 			  >Float</a
-			  > <a href=""
+			  > <a href="#"
 			  >Float</a
-			  > -&gt; <a href=""
+			  > -&gt; <a href="#"
 			  >T5</a
 			  > () ()</dfn
 			><div class="doc empty"
-			>&nbsp;</div
+			></div
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="" id="v:u" class="def"
+			><a href="#" id="v:u" class="def"
 			  >u</a
-			  >, <a href="" id="v:v" class="def"
+			  >, <a href="#" id="v:v" class="def"
 			  >v</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Int</a
 			  ></dfn
 			><div class="doc empty"
-			>&nbsp;</div
+			></div
 			></li
 		      ></ul
 		    ></div
@@ -1352,7 +1331,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:R1" class="def"
+	    > <a href="#" id="t:R1" class="def"
 	    >R1</a
 	    ></p
 	  ><div class="doc"
@@ -1365,13 +1344,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:C3" class="def"
+		><a href="#" id="v:C3" class="def"
 		  >C3</a
 		  ></td
 		><td class="doc"
 		><p
 		  >This is the <code
-		    ><a href=""
+		    ><a href="#"
 		      >C3</a
 		      ></code
 		    > record constructor</p
@@ -1385,15 +1364,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:s1" class="def"
+			><a href="#" id="v:s1" class="def"
 			  >s1</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Int</a
 			  ></dfn
 			><div class="doc"
 			><p
 			  >The <code
-			    ><a href=""
+			    ><a href="#"
 			      >s1</a
 			      ></code
 			    > record selector</p
@@ -1401,15 +1380,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="" id="v:s2" class="def"
+			><a href="#" id="v:s2" class="def"
 			  >s2</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Int</a
 			  ></dfn
 			><div class="doc"
 			><p
 			  >The <code
-			    ><a href=""
+			    ><a href="#"
 			      >s2</a
 			      ></code
 			    > record selector</p
@@ -1417,15 +1396,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="" id="v:s3" class="def"
+			><a href="#" id="v:s3" class="def"
 			  >s3</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >Int</a
 			  ></dfn
 			><div class="doc"
 			><p
 			  >The <code
-			    ><a href=""
+			    ><a href="#"
 			      >s3</a
 			      ></code
 			    > record selector</p
@@ -1448,9 +1427,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href=""
+	    > <a href="#"
 	    >D</a
-	    > a =&gt; <a href="" id="t:C" class="def"
+	    > a =&gt; <a href="#" id="t:C" class="def"
 	    >C</a
 	    > a <span class="keyword"
 	    >where</span
@@ -1460,36 +1439,46 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    >This comment applies to the <em
 	      >previous</em
 	      > declaration (the <code
-	      ><a href=""
+	      ><a href="#"
 		>C</a
 		></code
 	      > class)</p
 	    ></div
+	  ><div class="subs minimal"
+	  ><p class="caption"
+	    >Minimal complete definition</p
+	    ><p class="src"
+	    ><a href="#"
+	      >a</a
+	      >, <a href="#"
+	      >b</a
+	      ></p
+	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="" id="v:a" class="def"
+	    ><a href="#" id="v:a" class="def"
 	      >a</a
-	      > :: <a href=""
+	      > :: <a href="#"
 	      >IO</a
 	      > a</p
 	    ><div class="doc"
 	    ><p
 	      >this is a description of the <code
-		><a href=""
+		><a href="#"
 		  >a</a
 		  ></code
 		> method</p
 	      ></div
 	    ><p class="src"
-	    ><a href="" id="v:b" class="def"
+	    ><a href="#" id="v:b" class="def"
 	      >b</a
 	      > :: [a]</p
 	    ><div class="doc"
 	    ><p
 	      >this is a description of the <code
-		><a href=""
+		><a href="#"
 		  >b</a
 		  ></code
 		> method</p
@@ -1500,7 +1489,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:D" class="def"
+	    > <a href="#" id="t:D" class="def"
 	    >D</a
 	    > a <span class="keyword"
 	    >where</span
@@ -1509,17 +1498,27 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><p
 	    >This is a class declaration with no separate docs for the methods</p
 	    ></div
+	  ><div class="subs minimal"
+	  ><p class="caption"
+	    >Minimal complete definition</p
+	    ><p class="src"
+	    ><a href="#"
+	      >d</a
+	      >, <a href="#"
+	      >e</a
+	      ></p
+	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="" id="v:d" class="def"
+	    ><a href="#" id="v:d" class="def"
 	      >d</a
-	      > :: <a href=""
+	      > :: <a href="#"
 	      >T</a
 	      > a b</p
 	    ><p class="src"
-	    ><a href="" id="v:e" class="def"
+	    ><a href="#" id="v:e" class="def"
 	      >e</a
 	      > :: (a, a)</p
 	    ></div
@@ -1533,14 +1532,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:ic:D:D:1" class="instance expander" onclick="toggleSection('i:ic:D:D:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >D</a
-		      > <a href=""
+		      > <a href="#"
 		      >Float</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td colspan="2"
@@ -1549,19 +1548,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >d</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >T</a
-			  > <a href=""
+			  > <a href="#"
 			  >Float</a
 			  > b</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >e</a
-			  > :: (<a href=""
+			  > :: (<a href="#"
 			  >Float</a
-			  >, <a href=""
+			  >, <a href="#"
 			  >Float</a
 			  >)</p
 			></div
@@ -1573,14 +1572,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:ic:D:D:2" class="instance expander" onclick="toggleSection('i:ic:D:D:2')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >D</a
-		      > <a href=""
+		      > <a href="#"
 		      >Int</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td colspan="2"
@@ -1589,19 +1588,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 		      ><p class="caption"
 			>Methods</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >d</a
-			  > :: <a href=""
+			  > :: <a href="#"
 			  >T</a
-			  > <a href=""
+			  > <a href="#"
 			  >Int</a
 			  > b</p
 			><p class="src"
-			><a href=""
+			><a href="#"
 			  >e</a
-			  > :: (<a href=""
+			  > :: (<a href="#"
 			  >Int</a
-			  >, <a href=""
+			  >, <a href="#"
 			  >Int</a
 			  >)</p
 			></div
@@ -1616,7 +1615,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:E" class="def"
+	    > <a href="#" id="t:E" class="def"
 	    >E</a
 	    > a</p
 	  ><div class="doc"
@@ -1634,16 +1633,24 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:F" class="def"
+	    > <a href="#" id="t:F" class="def"
 	    >F</a
 	    > a <span class="keyword"
 	    >where</span
 	    ></p
+	  ><div class="subs minimal"
+	  ><p class="caption"
+	    >Minimal complete definition</p
+	    ><p class="src"
+	    ><a href="#"
+	      >ff</a
+	      ></p
+	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="" id="v:ff" class="def"
+	    ><a href="#" id="v:ff" class="def"
 	      >ff</a
 	      > :: a</p
 	    ></div
@@ -1652,26 +1659,44 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	><p
 	  >Test that we can export a class method on its own:</p
 	  ></div
+	><div class="top"
+	><p class="src"
+	  ><a href="#" id="v:a" class="def"
+	    >a</a
+	    > :: <a href="#"
+	    >C</a
+	    > a =&gt; <a href="#"
+	    >IO</a
+	    > a</p
+	  ><div class="doc"
+	  ><p
+	    >this is a description of the <code
+	      ><a href="#"
+		>a</a
+		></code
+	      > method</p
+	    ></div
+	  ></div
 	><h1 id="g:5"
 	>Function types</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:f" class="def"
+	  ><a href="#" id="v:f" class="def"
 	    >f</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >C</a
-	    > a =&gt; a -&gt; <a href=""
+	    > a =&gt; a -&gt; <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >In a comment string we can refer to identifiers in scope with
 single quotes like this: <code
-	      ><a href=""
+	      ><a href="#"
 		>T</a
 		></code
 	      >, and we can refer to modules by
-using double quotes: <a href=""
+using double quotes: <a href="#"
 	      >Foo</a
 	      >.  We can add emphasis <em
 	      >like this</em
@@ -1700,7 +1725,7 @@ using double quotes: <a href=""
 	      ></dl
 	    ><pre
 	    >     This is a block of code, which can include other markup: <code
-	      ><a href=""
+	      ><a href="#"
 		>R</a
 		></code
 	      >
@@ -1711,18 +1736,18 @@ using double quotes: <a href=""
 	    ><pre
 	    >this is another block of code</pre
 	    ><p
-	    >We can also include URLs in documentation: <a href=""
+	    >We can also include URLs in documentation: <a href="#"
 	      >http://www.haskell.org/</a
 	      >.</p
 	    ></div
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:g" class="def"
+	  ><a href="#" id="v:g" class="def"
 	    >g</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >IO</a
 	    > CInt</p
 	  ><div class="doc"
@@ -1734,24 +1759,16 @@ using double quotes: <a href=""
 	>Auxiliary stuff</h1
 	><div class="doc"
 	><p
-	  >This is some documentation that is attached to a name ($aux1)
- rather than a source declaration.  The documentation may be
- referred to in the export list using its name.</p
-	  ><pre
-	  > code block in named doc</pre
+	  >This is some documentation that is attached to a name ($aux1)</p
 	  ></div
 	><div class="doc"
 	><p
 	  >This is some documentation that is attached to a name ($aux2)</p
 	  ></div
-	><div class="doc"
-	><pre
-	  > code block on its own in named doc</pre
-	  ></div
-	><div class="doc"
-	><pre
-	  > code block on its own in named doc (after newline)</pre
-	  ></div
+	><div class="doc empty"
+	></div
+	><div class="doc empty"
+	></div
 	><div class="doc"
 	><p
 	  >a nested, named doc comment</p
@@ -1809,12 +1826,8 @@ test4</pre
 test2
 </pre
 	  ></div
-	><div class="doc"
-	><pre
-	  >foo</pre
-	  ><pre
-	  >bar</pre
-	  ></div
+	><div class="doc empty"
+	></div
 	><div class="doc"
 	><p
 	  >This is some inline documentation in the export list</p
@@ -1827,11 +1840,11 @@ is at the beginning of the line).</pre
 	>A hidden module</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:hidden" class="def"
+	  ><a href="#" id="v:hidden" class="def"
 	    >hidden</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >Int</a
 	    ></p
 	  ></div
@@ -1839,7 +1852,7 @@ is at the beginning of the line).</pre
 	>A visible module</h1
 	><div class="top"
 	><p class="src"
-	  >module <a href=""
+	  >module <a href="#"
 	    >Visible</a
 	    ></p
 	  ></div
@@ -1853,7 +1866,7 @@ is at the beginning of the line).</pre
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Ex" class="def"
+	    > <a href="#" id="t:Ex" class="def"
 	    >Ex</a
 	    > a</p
 	  ><div class="doc"
@@ -1866,47 +1879,41 @@ is at the beginning of the line).</pre
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><span class="keyword"
-		  >forall</span
-		  > b . <a href=""
+		><a href="#"
 		  >C</a
-		  > b =&gt; <a href="" id="v:Ex1" class="def"
+		  > b =&gt; <a href="#" id="v:Ex1" class="def"
 		  >Ex1</a
 		  > b</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><span class="keyword"
-		  >forall</span
-		  > b . <a href="" id="v:Ex2" class="def"
+		><a href="#" id="v:Ex2" class="def"
 		  >Ex2</a
 		  > b</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><span class="keyword"
-		  >forall</span
-		  > b . <a href=""
+		><a href="#"
 		  >C</a
-		  > a =&gt; <a href="" id="v:Ex3" class="def"
+		  > a =&gt; <a href="#" id="v:Ex3" class="def"
 		  >Ex3</a
 		  > b</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:Ex4" class="def"
+		><a href="#" id="v:Ex4" class="def"
 		  >Ex4</a
 		  > (<span class="keyword"
 		  >forall</span
 		  > a. a -&gt; a)</td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -1915,7 +1922,7 @@ is at the beginning of the line).</pre
 	>Type signatures with argument docs</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:k" class="def"
+	  ><a href="#" id="v:k" class="def"
 	    >k</a
 	    ></p
 	  ><div class="subs arguments"
@@ -1924,13 +1931,13 @@ is at the beginning of the line).</pre
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: <a href=""
+		>:: <a href="#"
 		  >T</a
 		  > () ()</td
 		><td class="doc"
 		><p
 		  >This argument has type <code
-		    ><a href=""
+		    ><a href="#"
 		      >T</a
 		      ></code
 		    ></p
@@ -1938,11 +1945,11 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href=""
+		>-&gt; <a href="#"
 		  >T2</a
-		  > <a href=""
+		  > <a href="#"
 		  >Int</a
-		  > <a href=""
+		  > <a href="#"
 		  >Int</a
 		  ></td
 		><td class="doc"
@@ -1952,17 +1959,17 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; (<a href=""
+		>-&gt; (<a href="#"
 		  >T3</a
-		  > <a href=""
+		  > <a href="#"
 		  >Bool</a
-		  > <a href=""
+		  > <a href="#"
 		  >Bool</a
-		  > -&gt; <a href=""
+		  > -&gt; <a href="#"
 		  >T4</a
-		  > <a href=""
+		  > <a href="#"
 		  >Float</a
-		  > <a href=""
+		  > <a href="#"
 		  >Float</a
 		  >)</td
 		><td class="doc"
@@ -1974,7 +1981,7 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href=""
+		>-&gt; <a href="#"
 		  >T5</a
 		  > () ()</td
 		><td class="doc"
@@ -1986,7 +1993,7 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href=""
+		>-&gt; <a href="#"
 		  >IO</a
 		  > ()</td
 		><td class="doc"
@@ -2003,7 +2010,7 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:l" class="def"
+	  ><a href="#" id="v:l" class="def"
 	    >l</a
 	    ></p
 	  ><div class="subs arguments"
@@ -2012,11 +2019,11 @@ is at the beginning of the line).</pre
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: (<a href=""
+		>:: (<a href="#"
 		  >Int</a
-		  >, <a href=""
+		  >, <a href="#"
 		  >Int</a
-		  >, <a href=""
+		  >, <a href="#"
 		  >Float</a
 		  >)</td
 		><td class="doc"
@@ -2026,13 +2033,13 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href=""
+		>-&gt; <a href="#"
 		  >Int</a
 		  ></td
 		><td class="doc"
 		><p
 		  >returns an <code
-		    ><a href=""
+		    ><a href="#"
 		      >Int</a
 		      ></code
 		    ></p
@@ -2043,7 +2050,7 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:m" class="def"
+	  ><a href="#" id="v:m" class="def"
 	    >m</a
 	    ></p
 	  ><div class="subs arguments"
@@ -2052,15 +2059,15 @@ is at the beginning of the line).</pre
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: <a href=""
+		>:: <a href="#"
 		  >R</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href=""
+		>-&gt; <a href="#"
 		  >N1</a
 		  > ()</td
 		><td class="doc"
@@ -2070,9 +2077,9 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href=""
+		>-&gt; <a href="#"
 		  >IO</a
-		  > <a href=""
+		  > <a href="#"
 		  >Int</a
 		  ></td
 		><td class="doc"
@@ -2089,7 +2096,7 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:o" class="def"
+	  ><a href="#" id="v:o" class="def"
 	    >o</a
 	    ></p
 	  ><div class="subs arguments"
@@ -2098,7 +2105,7 @@ is at the beginning of the line).</pre
 	    ><table
 	    ><tr
 	      ><td class="src"
-		>:: <a href=""
+		>:: <a href="#"
 		  >Float</a
 		  ></td
 		><td class="doc"
@@ -2108,9 +2115,9 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		>-&gt; <a href=""
+		>-&gt; <a href="#"
 		  >IO</a
-		  > <a href=""
+		  > <a href="#"
 		  >Float</a
 		  ></td
 		><td class="doc"
@@ -2139,15 +2146,15 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:f-39-" class="def"
+	  ><a href="#" id="v:f-39-" class="def"
 	    >f'</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >a function with a prime can be referred to as <code
-	      ><a href=""
+	      ><a href="#"
 		>f'</a
 		></code
 	      >
@@ -2156,9 +2163,9 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:withType" class="def"
+	  ><a href="#" id="v:withType" class="def"
 	    >withType</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -2168,9 +2175,9 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:withoutType" class="def"
+	  ><a href="#" id="v:withoutType" class="def"
 	    >withoutType</a
-	    > :: t</p
+	    > :: a</p
 	  ><div class="doc"
 	  ><p
 	    >Comment on a definition without type signature</p
@@ -2179,11 +2186,7 @@ is at the beginning of the line).</pre
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Threaded.html b/html-test/ref/Threaded.html
index 1f54b9ea..7aacfb60 100644
--- a/html-test/ref/Threaded.html
+++ b/html-test/ref/Threaded.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Threaded</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Threaded.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Threaded.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -56,9 +57,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=""
+	  ><a href="#"
 	    >f</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Integer</a
 	    ></li
 	  ></ul
@@ -68,9 +69,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Threaded.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:f" class="def"
+	  ><a href="#" id="v:f" class="def"
 	    >f</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Integer</a
 	    ></p
 	  ><div class="doc"
@@ -84,11 +85,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Threaded.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Threaded_TH.html b/html-test/ref/Threaded_TH.html
new file mode 100644
index 00000000..ca191bd6
--- /dev/null
+++ b/html-test/ref/Threaded_TH.html
@@ -0,0 +1,88 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+><head
+  ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
+     /><title
+    >Threaded_TH</title
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+     /><script src="haddock-util.js" type="text/javascript"
+    ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
+    ><script type="text/javascript"
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Threaded_TH.html&quot;);};
+//
+</script
+    ></head
+  ><body
+  ><div id="package-header"
+    ><ul class="links" id="page-menu"
+      ><li
+	><a href="#"
+	  >Contents</a
+	  ></li
+	><li
+	><a href="#"
+	  >Index</a
+	  ></li
+	></ul
+      ><p class="caption empty"
+      ></p
+      ></div
+    ><div id="content"
+    ><div id="module-header"
+      ><table class="info"
+	><tr
+	  ><th
+	    >Safe Haskell</th
+	    ><td
+	    >None</td
+	    ></tr
+	  ></table
+	><p class="caption"
+	>Threaded_TH</p
+	></div
+      ><div id="description"
+      ><p class="caption"
+	>Description</p
+	><div class="doc"
+	><p
+	  >Imported by <code
+	    >Threaded</code
+	    >, since a TH splice can't be used in the
+ module where it is defined.</p
+	  ></div
+	></div
+      ><div id="synopsis"
+      ><p id="control.syn" class="caption expander" onclick="toggleSection('syn')"
+	>Synopsis</p
+	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
+	><li class="src short"
+	  ><a href="#"
+	    >forkTH</a
+	    > :: Q Exp</li
+	  ></ul
+	></div
+      ><div id="interface"
+      ><h1
+	>Documentation</h1
+	><div class="top"
+	><p class="src"
+	  ><a href="#" id="v:forkTH" class="def"
+	    >forkTH</a
+	    > :: Q Exp</p
+	  ><div class="doc"
+	  ><p
+	    >forkOS requires the threaded RTS, so this TH fails if haddock was
+ built without <code
+	      >-threaded</code
+	      >.</p
+	    ></div
+	  ></div
+	></div
+      ></div
+    ><div id="footer"
+    ></div
+    ></body
+  ></html
+>
\ No newline at end of file
diff --git a/html-test/ref/Ticket112.html b/html-test/ref/Ticket112.html
index 4aefb488..42e9cf13 100644
--- a/html-test/ref/Ticket112.html
+++ b/html-test/ref/Ticket112.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Ticket112</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Ticket112.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,7 +47,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >f</a
 	    > :: a</li
 	  ></ul
@@ -56,13 +57,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:f" class="def"
+	  ><a href="#" id="v:f" class="def"
 	    >f</a
 	    > :: a</p
 	  ><div class="doc"
 	  ><p
 	    >...given a raw <code
-	      ><a href=""
+	      ><a href="#"
 		>Addr#</a
 		></code
 	      > to the string, and the length of the string.</p
@@ -71,11 +72,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Ticket61.html b/html-test/ref/Ticket61.html
index aeb3c022..cb6ee3d7 100644
--- a/html-test/ref/Ticket61.html
+++ b/html-test/ref/Ticket61.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Ticket61</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Ticket61.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Ticket61.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,16 +49,24 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket61.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:C" class="def"
+	    > <a href="#" id="t:C" class="def"
 	    >C</a
 	    > a <span class="keyword"
 	    >where</span
 	    ></p
+	  ><div class="subs minimal"
+	  ><p class="caption"
+	    >Minimal complete definition</p
+	    ><p class="src"
+	    ><a href="#"
+	      >f</a
+	      ></p
+	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="" id="v:f" class="def"
+	    ><a href="#" id="v:f" class="def"
 	      >f</a
 	      > :: a</p
 	    ><div class="doc"
@@ -69,11 +78,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket61.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Ticket75.html b/html-test/ref/Ticket75.html
index 169b0522..948453cf 100644
--- a/html-test/ref/Ticket75.html
+++ b/html-test/ref/Ticket75.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Ticket75</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Ticket75.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Ticket75.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,15 +49,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket75.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a href=""
+	    > a <a href="#"
 	    >:-</a
-	    > b = <a href=""
+	    > b = <a href="#"
 	    >Q</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >f</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ></ul
@@ -68,7 +69,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket75.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a href="" id="t::-45-" class="def"
+	    > a <a href="#" id="t::-45-" class="def"
 	    >:-</a
 	    > b</p
 	  ><div class="subs constructors"
@@ -77,26 +78,26 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket75.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:Q" class="def"
+		><a href="#" id="v:Q" class="def"
 		  >Q</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:f" class="def"
+	  ><a href="#" id="v:f" class="def"
 	    >f</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >A reference to <code
-	      ><a href=""
+	      ><a href="#"
 		>:-</a
 		></code
 	      ></p
@@ -105,11 +106,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket75.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/TitledPicture.html b/html-test/ref/TitledPicture.html
index 3aac9689..1b0cc539 100644
--- a/html-test/ref/TitledPicture.html
+++ b/html-test/ref/TitledPicture.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >TitledPicture</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_TitledPicture.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_TitledPicture.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,15 +47,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_TitledPicture.html");}
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Integer</a
 	    ></li
 	  ><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >bar</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Integer</a
 	    ></li
 	  ></ul
@@ -64,15 +65,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_TitledPicture.html");}
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:foo" class="def"
+	  ><a href="#" id="v:foo" class="def"
 	    >foo</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Integer</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Picture for <code
-	      ><a href=""
+	      ><a href="#"
 		>foo</a
 		></code
 	      > without a title <img src="bar"
@@ -81,15 +82,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_TitledPicture.html");}
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:bar" class="def"
+	  ><a href="#" id="v:bar" class="def"
 	    >bar</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Integer</a
 	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Picture for <code
-	      ><a href=""
+	      ><a href="#"
 		>bar</a
 		></code
 	      > with title <img src="un&#8739;&#8705;&#8728;" title="&#948;&#8712;"
@@ -99,11 +100,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TitledPicture.html");}
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index 3295318f..a55a55ad 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >TypeFamilies</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -56,19 +57,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >X</a
 	    ><ul class="subs"
 	    ><li
-	      >= <a href=""
+	      >= <a href="#"
 		>X</a
 		></li
 	      ><li
-	      >| <a href=""
+	      >| <a href="#"
 		>XX</a
 		></li
 	      ><li
-	      >| <a href=""
+	      >| <a href="#"
 		>XXX</a
 		></li
 	      ></ul
@@ -76,21 +77,21 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >Y</a
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >Z</a
 	    ><ul class="subs"
 	    ><li
-	      >= <a href=""
+	      >= <a href="#"
 		>ZA</a
 		></li
 	      ><li
-	      >| <a href=""
+	      >| <a href="#"
 		>ZB</a
 		></li
 	      ></ul
@@ -98,25 +99,27 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href=""
+	    > <a href="#"
 	    >Test</a
 	    > a</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >type family</span
-	    > <a href=""
+	    > <a href="#"
 	    >Foo</a
 	    > a :: k</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a href=""
+	    > <a href="#"
 	    >Bat</a
-	    > a :: *</li
+	    > a :: <a href="#"
+	    >*</a
+	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href=""
+	    > <a href="#"
 	    >Assoc</a
 	    > a <span class="keyword"
 	    >where</span
@@ -124,33 +127,37 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	    ><li
 	      ><span class="keyword"
 		>data</span
-		> <a href=""
+		> <a href="#"
 		>AssocD</a
-		> a :: *</li
+		> a :: <a href="#"
+		>*</a
+		></li
 	      ><li
 	      ><span class="keyword"
 		>type</span
-		> <a href=""
+		> <a href="#"
 		>AssocT</a
-		> a :: *</li
+		> a :: <a href="#"
+		>*</a
+		></li
 	      ></ul
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >type family</span
-	    > <a href=""
+	    > <a href="#"
 	    >Bar</a
 	    > b</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >type family</span
-	    > a <a href=""
+	    > a <a href="#"
 	    >&lt;&gt;</a
 	    > b :: k</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >class</span
-	    > a <a href=""
+	    > a <a href="#"
 	    >&gt;&lt;</a
 	    > b</li
 	  ></ul
@@ -162,7 +169,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:X" class="def"
+	    > <a href="#" id="t:X" class="def"
 	    >X</a
 	    ></p
 	  ><div class="doc"
@@ -175,7 +182,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:X" class="def"
+		><a href="#" id="v:X" class="def"
 		  >X</a
 		  ></td
 		><td class="doc"
@@ -185,7 +192,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:XX" class="def"
+		><a href="#" id="v:XX" class="def"
 		  >XX</a
 		  ></td
 		><td class="doc"
@@ -195,7 +202,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:XXX" class="def"
+		><a href="#" id="v:XXX" class="def"
 		  >XXX</a
 		  ></td
 		><td class="doc"
@@ -213,11 +220,37 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	      ><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
-		    ><span id="control.i:id:X:Assoc:1" class="instance expander" onclick="toggleSection('i:id:X:Assoc:1')"
+		    ><span id="control.i:id:X:-62--60-:1" class="instance expander" onclick="toggleSection('i:id:X:-62--60-:1')"
+		      ></span
+		      > <a href="#"
+		      >(&gt;&lt;)</a
+		      > <a href="#"
+		      >X</a
+		      > <a href="#"
+		      >XX</a
+		      > <a href="#"
+		      >XXX</a
 		      ></span
-		      > <a href=""
+		    ></td
+		  ><td class="doc empty"
+		  ></td
+		  ></tr
+		><tr
+		><td colspan="2"
+		  ><div id="section.i:id:X:-62--60-:1" class="inst-details hide"
+		    ></div
+		    ></td
+		  ></tr
+		><tr
+		><td class="src clearfix"
+		  ><span class="inst-left"
+		    ><span id="control.i:id:X:Assoc:2" class="instance expander" onclick="toggleSection('i:id:X:Assoc:2')"
+		      ></span
+		      > <a href="#"
 		      >Assoc</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >X</a
 		      ></span
 		    ></td
@@ -228,26 +261,34 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ></tr
 		><tr
 		><td colspan="2"
-		  ><div id="section.i:id:X:Assoc:1" class="inst-details hide"
+		  ><div id="section.i:id:X:Assoc:2" class="inst-details hide"
 		    ><div class="subs associated-types"
 		      ><p class="caption"
 			>Associated Types</p
 			><p class="src"
 			><span class="keyword"
 			  >data</span
-			  > <a href=""
+			  > <a href="#"
 			  >AssocD</a
-			  > (<a href=""
+			  > <a href="#"
+			  >X</a
+			  > (a :: <a href="#"
 			  >X</a
-			  > :: k)</p
+			  >) :: <a href="#"
+			  >*</a
+			  ></p
 			><p class="src"
 			><span class="keyword"
 			  >type</span
-			  > <a href=""
+			  > <a href="#"
 			  >AssocT</a
-			  > (<a href=""
+			  > <a href="#"
 			  >X</a
-			  > :: k) :: *</p
+			  > (a :: <a href="#"
+			  >X</a
+			  >) :: <a href="#"
+			  >*</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -255,11 +296,13 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
-		    ><span id="control.i:id:X:Test:2" class="instance expander" onclick="toggleSection('i:id:X:Test:2')"
+		    ><span id="control.i:id:X:Test:3" class="instance expander" onclick="toggleSection('i:id:X:Test:3')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Test</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >X</a
 		      ></span
 		    ></td
@@ -270,116 +313,118 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ></tr
 		><tr
 		><td colspan="2"
-		  ><div id="section.i:id:X:Test:2" class="inst-details hide"
+		  ><div id="section.i:id:X:Test:3" class="inst-details hide"
 		    ></div
 		    ></td
 		  ></tr
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
-		    ><span id="control.i:id:X:-62--60-:3" class="instance expander" onclick="toggleSection('i:id:X:-62--60-:3')"
-		      ></span
-		      > <a href=""
-		      >(&gt;&lt;)</a
-		      > <a href=""
+		    ><span class="keyword"
+		      >type</span
+		      > <a href="#"
+		      >Foo</a
+		      > <a href="#"
 		      >X</a
-		      > <a href=""
-		      >XX</a
-		      > <a href=""
-		      >XXX</a
+		      > = <a href="#"
+		      >Y</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
-		  ></tr
-		><tr
-		><td colspan="2"
-		  ><div id="section.i:id:X:-62--60-:3" class="inst-details hide"
-		    ></div
-		    ></td
+		  ></td
 		  ></tr
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >type</span
-		      > <a href=""
-		      >Foo</a
-		      > <a href=""
+		      > <a href="#"
+		      >(&lt;&gt;)</a
+		      > <a href="#"
+		      >X</a
+		      > <a href="#"
+		      >XXX</a
+		      > <a href="#"
+		      >XX</a
+		      > = <a href="#"
 		      >X</a
-		      > = <a href=""
-		      >Y</a
 		      ></span
 		    ></td
-		  ><td class="doc"
-		  ><p
-		    >External instance</p
-		    ></td
+		  ><td class="doc empty"
+		  ></td
 		  ></tr
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >data</span
-		      > <a href=""
+		      > <a href="#"
 		      >AssocD</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >X</a
-		      > = <a href="" id="v:AssocX" class="def"
+		      > = <a href="#" id="v:AssocX" class="def"
 		      >AssocX</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >type</span
-		      > <a href=""
+		      > <a href="#"
 		      >AssocT</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >X</a
-		      > = <a href=""
+		      > = <a href="#"
 		      >Foo</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >X</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >data</span
-		      > <a href=""
+		      > <a href="#"
 		      >Bat</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >X</a
 		      > <ul class="inst"
 		      ><li class="inst"
-			>= <a href="" id="v:BatX" class="def"
+			>= <a href="#" id="v:BatX" class="def"
 			  >BatX</a
-			  > <a href=""
+			  > <a href="#"
 			  >X</a
 			  ></li
 			><li class="inst"
-			>| <a href="" id="v:BatXX" class="def"
+			>| <a href="#" id="v:BatXX" class="def"
 			  >BatXX</a
 			  > { <ul class="subs"
 			  ><li
-			    ><a href="" id="v:aaa" class="def"
+			    ><a href="#" id="v:aaa" class="def"
 			      >aaa</a
-			      > :: <a href=""
+			      > :: <a href="#"
 			      >X</a
 			      ></li
 			    ><li
-			    ><a href="" id="v:bbb" class="def"
+			    ><a href="#" id="v:bbb" class="def"
 			      >bbb</a
-			      > :: <a href=""
+			      > :: <a href="#"
 			      >Y</a
 			      ></li
 			    ></ul
@@ -397,54 +442,36 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >type</span
-		      > <a href=""
+		      > <a href="#"
 		      >Foo</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >X</a
-		      > = <a href=""
+		      > = <a href="#"
 		      >Y</a
 		      ></span
 		    ></td
-		  ><td class="doc"
-		  ><p
-		    >Doc for: type instance Foo X = Y</p
-		    ></td
-		  ></tr
-		><tr
-		><td class="src clearfix"
-		  ><span class="inst-left"
-		    ><span class="keyword"
-		      >type</span
-		      > <a href=""
-		      >(&lt;&gt;)</a
-		      > * <a href=""
-		      >X</a
-		      > a = <a href=""
-		      >X</a
-		      ></span
-		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >type</span
-		      > <a href=""
+		      > <a href="#"
 		      >(&lt;&gt;)</a
-		      > <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >X</a
-		      > <a href=""
-		      >XXX</a
-		      > <a href=""
-		      >XX</a
-		      > = <a href=""
+		      > a = <a href="#"
 		      >X</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		></table
 	      ></div
@@ -454,7 +481,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Y" class="def"
+	    > <a href="#" id="t:Y" class="def"
 	    >Y</a
 	    ></p
 	  ><div class="doc"
@@ -471,9 +498,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:id:Y:Assoc:1" class="instance expander" onclick="toggleSection('i:id:Y:Assoc:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Assoc</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >Y</a
 		      ></span
 		    ></td
@@ -491,19 +520,27 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 			><p class="src"
 			><span class="keyword"
 			  >data</span
-			  > <a href=""
+			  > <a href="#"
 			  >AssocD</a
-			  > (<a href=""
+			  > <a href="#"
+			  >Y</a
+			  > (a :: <a href="#"
 			  >Y</a
-			  > :: k)</p
+			  >) :: <a href="#"
+			  >*</a
+			  ></p
 			><p class="src"
 			><span class="keyword"
 			  >type</span
-			  > <a href=""
+			  > <a href="#"
 			  >AssocT</a
-			  > (<a href=""
+			  > <a href="#"
 			  >Y</a
-			  > :: k) :: *</p
+			  > (a :: <a href="#"
+			  >Y</a
+			  >) :: <a href="#"
+			  >*</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -513,9 +550,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:id:Y:Test:2" class="instance expander" onclick="toggleSection('i:id:Y:Test:2')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Test</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >Y</a
 		      ></span
 		    ></td
@@ -535,61 +574,69 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >data</span
-		      > <a href=""
+		      > <a href="#"
 		      >Bar</a
-		      > <a href=""
+		      > <a href="#"
 		      >Y</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >data</span
-		      > <a href=""
+		      > <a href="#"
 		      >AssocD</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >Y</a
-		      > = <a href="" id="v:AssocY" class="def"
+		      > = <a href="#" id="v:AssocY" class="def"
 		      >AssocY</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >type</span
-		      > <a href=""
+		      > <a href="#"
 		      >AssocT</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >Y</a
-		      > = <a href=""
+		      > = <a href="#"
 		      >Bat</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >Y</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >data</span
-		      > <a href=""
+		      > <a href="#"
 		      >Bat</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >Y</a
-		      > = <a href="" id="v:BatY" class="def"
+		      > = <a href="#" id="v:BatY" class="def"
 		      >BatY</a
-		      > <a href=""
+		      > <a href="#"
 		      >Y</a
 		      ></span
 		    ></td
@@ -603,32 +650,34 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >type</span
-		      > <a href=""
+		      > <a href="#"
 		      >Foo</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >Y</a
-		      > = <a href=""
+		      > = <a href="#"
 		      >X</a
 		      ></span
 		    ></td
-		  ><td class="doc"
-		  ><p
-		    >Doc for: type instance Foo Y = X</p
-		    ></td
+		  ><td class="doc empty"
+		  ></td
 		  ></tr
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >type</span
-		      > <a href=""
+		      > <a href="#"
 		      >(&lt;&gt;)</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >Y</a
 		      > a = a</span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		></table
 	      ></div
@@ -638,7 +687,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Z" class="def"
+	    > <a href="#" id="t:Z" class="def"
 	    >Z</a
 	    ></p
 	  ><div class="doc"
@@ -651,19 +700,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:ZA" class="def"
+		><a href="#" id="v:ZA" class="def"
 		  >ZA</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="" id="v:ZB" class="def"
+		><a href="#" id="v:ZB" class="def"
 		  >ZB</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -677,47 +726,31 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >data</span
-		      > <a href=""
+		      > <a href="#"
 		      >Bat</a
-		      > <a href=""
+		      > <a href="#"
 		      >Z</a
 		      > <span class="keyword"
 		      >where</span
 		      ><ul class="inst"
 		      ><li class="inst"
-			><a href="" id="v:BatZ1" class="def"
+			><a href="#" id="v:BatZ1" class="def"
 			  >BatZ1</a
-			  > ::  <a href=""
-			  >Z</a
-			  > -&gt; <a href=""
+			  > :: <a href="#"
 			  >Bat</a
-			  > <a href=""
+			  > <a href="#"
 			  >Z</a
-			  > <a href=""
+			  > <a href="#"
 			  >ZA</a
 			  ></li
 			><li class="inst"
-			><a href="" id="v:BatZ2" class="def"
+			><a href="#" id="v:BatZ2" class="def"
 			  >BatZ2</a
-			  > :: { <ul class="subs"
-			  ><li
-			    ><a href="" id="v:batx" class="def"
-			      >batx</a
-			      > :: <a href=""
-			      >X</a
-			      ></li
-			    ><li
-			    ><a href="" id="v:baty" class="def"
-			      >baty</a
-			      > :: <a href=""
-			      >Y</a
-			      ></li
-			    ></ul
-			  > } -&gt; <a href=""
+			  > :: <a href="#"
 			  >Bat</a
-			  > <a href=""
+			  > <a href="#"
 			  >Z</a
-			  > <a href=""
+			  > <a href="#"
 			  >ZB</a
 			  ></li
 			></ul
@@ -736,7 +769,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:Test" class="def"
+	    > <a href="#" id="t:Test" class="def"
 	    >Test</a
 	    > a</p
 	  ><div class="doc"
@@ -753,9 +786,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:ic:Test:Test:1" class="instance expander" onclick="toggleSection('i:ic:Test:Test:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Test</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >Y</a
 		      ></span
 		    ></td
@@ -775,9 +810,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:ic:Test:Test:2" class="instance expander" onclick="toggleSection('i:ic:Test:Test:2')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Test</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >X</a
 		      ></span
 		    ></td
@@ -800,7 +837,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > <a href="" id="t:Foo" class="def"
+	    > <a href="#" id="t:Foo" class="def"
 	    >Foo</a
 	    > a :: k</p
 	  ><div class="doc"
@@ -817,36 +854,36 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >type</span
-		      > <a href=""
+		      > <a href="#"
 		      >Foo</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >Y</a
-		      > = <a href=""
+		      > = <a href="#"
 		      >X</a
 		      ></span
 		    ></td
-		  ><td class="doc"
-		  ><p
-		    >Doc for: type instance Foo Y = X</p
-		    ></td
+		  ><td class="doc empty"
+		  ></td
 		  ></tr
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >type</span
-		      > <a href=""
+		      > <a href="#"
 		      >Foo</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >X</a
-		      > = <a href=""
+		      > = <a href="#"
 		      >Y</a
 		      ></span
 		    ></td
-		  ><td class="doc"
-		  ><p
-		    >Doc for: type instance Foo X = Y</p
-		    ></td
+		  ><td class="doc empty"
+		  ></td
 		  ></tr
 		></table
 	      ></div
@@ -856,9 +893,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a href="" id="t:Bat" class="def"
+	    > <a href="#" id="t:Bat" class="def"
 	    >Bat</a
-	    > a :: *</p
+	    > a :: <a href="#"
+	    >*</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Doc for: data family Bat a</p
@@ -873,47 +912,31 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >data</span
-		      > <a href=""
+		      > <a href="#"
 		      >Bat</a
-		      > <a href=""
+		      > <a href="#"
 		      >Z</a
 		      > <span class="keyword"
 		      >where</span
 		      ><ul class="inst"
 		      ><li class="inst"
-			><a href="" id="v:BatZ1" class="def"
+			><a href="#" id="v:BatZ1" class="def"
 			  >BatZ1</a
-			  > ::  <a href=""
-			  >Z</a
-			  > -&gt; <a href=""
+			  > :: <a href="#"
 			  >Bat</a
-			  > <a href=""
+			  > <a href="#"
 			  >Z</a
-			  > <a href=""
+			  > <a href="#"
 			  >ZA</a
 			  ></li
 			><li class="inst"
-			><a href="" id="v:BatZ2" class="def"
+			><a href="#" id="v:BatZ2" class="def"
 			  >BatZ2</a
-			  > :: { <ul class="subs"
-			  ><li
-			    ><a href="" id="v:batx" class="def"
-			      >batx</a
-			      > :: <a href=""
-			      >X</a
-			      ></li
-			    ><li
-			    ><a href="" id="v:baty" class="def"
-			      >baty</a
-			      > :: <a href=""
-			      >Y</a
-			      ></li
-			    ></ul
-			  > } -&gt; <a href=""
+			  > :: <a href="#"
 			  >Bat</a
-			  > <a href=""
+			  > <a href="#"
 			  >Z</a
-			  > <a href=""
+			  > <a href="#"
 			  >ZB</a
 			  ></li
 			></ul
@@ -929,13 +952,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >data</span
-		      > <a href=""
+		      > <a href="#"
 		      >Bat</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >Y</a
-		      > = <a href="" id="v:BatY" class="def"
+		      > = <a href="#" id="v:BatY" class="def"
 		      >BatY</a
-		      > <a href=""
+		      > <a href="#"
 		      >Y</a
 		      ></span
 		    ></td
@@ -949,31 +974,33 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >data</span
-		      > <a href=""
+		      > <a href="#"
 		      >Bat</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >X</a
 		      > <ul class="inst"
 		      ><li class="inst"
-			>= <a href="" id="v:BatX" class="def"
+			>= <a href="#" id="v:BatX" class="def"
 			  >BatX</a
-			  > <a href=""
+			  > <a href="#"
 			  >X</a
 			  ></li
 			><li class="inst"
-			>| <a href="" id="v:BatXX" class="def"
+			>| <a href="#" id="v:BatXX" class="def"
 			  >BatXX</a
 			  > { <ul class="subs"
 			  ><li
-			    ><a href="" id="v:aaa" class="def"
+			    ><a href="#" id="v:aaa" class="def"
 			      >aaa</a
-			      > :: <a href=""
+			      > :: <a href="#"
 			      >X</a
 			      ></li
 			    ><li
-			    ><a href="" id="v:bbb" class="def"
+			    ><a href="#" id="v:bbb" class="def"
 			      >bbb</a
-			      > :: <a href=""
+			      > :: <a href="#"
 			      >Y</a
 			      ></li
 			    ></ul
@@ -994,7 +1021,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="" id="t:Assoc" class="def"
+	    > <a href="#" id="t:Assoc" class="def"
 	    >Assoc</a
 	    > a</p
 	  ><div class="doc"
@@ -1007,9 +1034,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	    ><p class="src"
 	    ><span class="keyword"
 	      >data</span
-	      > <a href="" id="t:AssocD" class="def"
+	      > <a href="#" id="t:AssocD" class="def"
 	      >AssocD</a
-	      > a :: *</p
+	      > a :: <a href="#"
+	      >*</a
+	      ></p
 	    ><div class="doc"
 	    ><p
 	      >Doc for: data AssocD a</p
@@ -1017,9 +1046,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	    ><p class="src"
 	    ><span class="keyword"
 	      >type</span
-	      > <a href="" id="t:AssocT" class="def"
+	      > <a href="#" id="t:AssocT" class="def"
 	      >AssocT</a
-	      > a :: *</p
+	      > a :: <a href="#"
+	      >*</a
+	      ></p
 	    ><div class="doc"
 	    ><p
 	      >Doc for: type AssocT a</p
@@ -1035,9 +1066,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:ic:Assoc:Assoc:1" class="instance expander" onclick="toggleSection('i:ic:Assoc:Assoc:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Assoc</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >Y</a
 		      ></span
 		    ></td
@@ -1055,19 +1088,27 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 			><p class="src"
 			><span class="keyword"
 			  >data</span
-			  > <a href=""
+			  > <a href="#"
 			  >AssocD</a
-			  > (<a href=""
+			  > <a href="#"
+			  >Y</a
+			  > (a :: <a href="#"
 			  >Y</a
-			  > :: k)</p
+			  >) :: <a href="#"
+			  >*</a
+			  ></p
 			><p class="src"
 			><span class="keyword"
 			  >type</span
-			  > <a href=""
+			  > <a href="#"
 			  >AssocT</a
-			  > (<a href=""
+			  > <a href="#"
 			  >Y</a
-			  > :: k) :: *</p
+			  > (a :: <a href="#"
+			  >Y</a
+			  >) :: <a href="#"
+			  >*</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -1077,9 +1118,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:ic:Assoc:Assoc:2" class="instance expander" onclick="toggleSection('i:ic:Assoc:Assoc:2')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >Assoc</a
-		      > * <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >X</a
 		      ></span
 		    ></td
@@ -1097,19 +1140,27 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 			><p class="src"
 			><span class="keyword"
 			  >data</span
-			  > <a href=""
+			  > <a href="#"
 			  >AssocD</a
-			  > (<a href=""
+			  > <a href="#"
+			  >X</a
+			  > (a :: <a href="#"
 			  >X</a
-			  > :: k)</p
+			  >) :: <a href="#"
+			  >*</a
+			  ></p
 			><p class="src"
 			><span class="keyword"
 			  >type</span
-			  > <a href=""
+			  > <a href="#"
 			  >AssocT</a
-			  > (<a href=""
+			  > <a href="#"
 			  >X</a
-			  > :: k) :: *</p
+			  > (a :: <a href="#"
+			  >X</a
+			  >) :: <a href="#"
+			  >*</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -1122,7 +1173,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > <a href="" id="t:Bar" class="def"
+	    > <a href="#" id="t:Bar" class="def"
 	    >Bar</a
 	    > b</p
 	  ><div class="doc"
@@ -1135,25 +1186,25 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href=""
+		><a href="#"
 		  >Bar</a
-		  > <a href=""
+		  > <a href="#"
 		  >X</a
-		  > = <a href=""
+		  > = <a href="#"
 		  >X</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href=""
+		><a href="#"
 		  >Bar</a
-		  > y = <a href=""
+		  > y = <a href="#"
 		  >Y</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ></table
 	    ></div
@@ -1162,7 +1213,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > a <a href="" id="t:-60--62-" class="def"
+	    > a <a href="#" id="t:-60--62-" class="def"
 	    >&lt;&gt;</a
 	    > b :: k</p
 	  ><div class="subs instances"
@@ -1175,50 +1226,54 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >type</span
-		      > <a href=""
+		      > <a href="#"
 		      >(&lt;&gt;)</a
-		      > * <a href=""
-		      >Y</a
-		      > a = a</span
+		      > <a href="#"
+		      >X</a
+		      > <a href="#"
+		      >XXX</a
+		      > <a href="#"
+		      >XX</a
+		      > = <a href="#"
+		      >X</a
+		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >type</span
-		      > <a href=""
+		      > <a href="#"
 		      >(&lt;&gt;)</a
-		      > * <a href=""
-		      >X</a
-		      > a = <a href=""
-		      >X</a
-		      ></span
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
+		      >Y</a
+		      > a = a</span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >type</span
-		      > <a href=""
+		      > <a href="#"
 		      >(&lt;&gt;)</a
-		      > <a href=""
+		      > <a href="#"
+		      >*</a
+		      > <a href="#"
 		      >X</a
-		      > <a href=""
-		      >XXX</a
-		      > <a href=""
-		      >XX</a
-		      > = <a href=""
+		      > a = <a href="#"
 		      >X</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		></table
 	      ></div
@@ -1228,7 +1283,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > a <a href="" id="t:-62--60-" class="def"
+	    > a <a href="#" id="t:-62--60-" class="def"
 	    >&gt;&lt;</a
 	    > b</p
 	  ><div class="subs instances"
@@ -1241,18 +1296,18 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 		  ><span class="inst-left"
 		    ><span id="control.i:ic:-62--60-:-62--60-:1" class="instance expander" onclick="toggleSection('i:ic:-62--60-:-62--60-:1')"
 		      ></span
-		      > <a href=""
+		      > <a href="#"
 		      >(&gt;&lt;)</a
-		      > <a href=""
+		      > <a href="#"
 		      >X</a
-		      > <a href=""
+		      > <a href="#"
 		      >XX</a
-		      > <a href=""
+		      > <a href="#"
 		      >XXX</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		><tr
 		><td colspan="2"
@@ -1267,11 +1322,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/TypeFamilies2.html b/html-test/ref/TypeFamilies2.html
index 0c7e4ec6..dae60489 100644
--- a/html-test/ref/TypeFamilies2.html
+++ b/html-test/ref/TypeFamilies2.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >TypeFamilies2</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies2.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,19 +49,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
 	><li class="src short"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href=""
+	    > <a href="#"
 	    >W</a
 	    ></li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >type family</span
-	    > <a href=""
+	    > <a href="#"
 	    >Foo</a
 	    > a</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a href=""
+	    > <a href="#"
 	    >Bar</a
 	    > a</li
 	  ></ul
@@ -72,7 +73,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:W" class="def"
+	    > <a href="#" id="t:W" class="def"
 	    >W</a
 	    ></p
 	  ><div class="doc"
@@ -89,11 +90,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >data</span
-		      > <a href=""
+		      > <a href="#"
 		      >Bar</a
-		      > <a href=""
+		      > <a href="#"
 		      >W</a
-		      > = <a href="" id="v:BarX" class="def"
+		      > = <a href="#" id="v:BarX" class="def"
 		      >BarX</a
 		      > Z</span
 		    ></td
@@ -107,16 +108,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >type</span
-		      > <a href=""
+		      > <a href="#"
 		      >Foo</a
-		      > <a href=""
+		      > <a href="#"
 		      >W</a
 		      ></span
 		    ></td
-		  ><td class="doc"
-		  ><p
-		    >Should be visible, but with a hidden right hand side</p
-		    ></td
+		  ><td class="doc empty"
+		  ></td
 		  ></tr
 		></table
 	      ></div
@@ -126,7 +125,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > <a href="" id="t:Foo" class="def"
+	    > <a href="#" id="t:Foo" class="def"
 	    >Foo</a
 	    > a</p
 	  ><div class="doc"
@@ -143,34 +142,30 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >type</span
-		      > <a href=""
+		      > <a href="#"
 		      >Foo</a
-		      > <a href=""
+		      > <a href="#"
 		      >W</a
 		      ></span
 		    ></td
-		  ><td class="doc"
-		  ><p
-		    >Should be visible, but with a hidden right hand side</p
-		    ></td
+		  ><td class="doc empty"
+		  ></td
 		  ></tr
 		><tr
 		><td class="src clearfix"
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >type</span
-		      > <a href=""
+		      > <a href="#"
 		      >Foo</a
-		      > <a href=""
+		      > <a href="#"
 		      >X</a
-		      > = <a href=""
+		      > = <a href="#"
 		      >Y</a
 		      ></span
 		    ></td
-		  ><td class="doc"
-		  ><p
-		    >External instance</p
-		    ></td
+		  ><td class="doc empty"
+		  ></td
 		  ></tr
 		></table
 	      ></div
@@ -180,7 +175,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a href="" id="t:Bar" class="def"
+	    > <a href="#" id="t:Bar" class="def"
 	    >Bar</a
 	    > a</p
 	  ><div class="doc"
@@ -197,11 +192,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >data</span
-		      > <a href=""
+		      > <a href="#"
 		      >Bar</a
-		      > <a href=""
+		      > <a href="#"
 		      >W</a
-		      > = <a href="" id="v:BarX" class="def"
+		      > = <a href="#" id="v:BarX" class="def"
 		      >BarX</a
 		      > Z</span
 		    ></td
@@ -215,14 +210,14 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
 		  ><span class="inst-left"
 		    ><span class="keyword"
 		      >data</span
-		      > <a href=""
+		      > <a href="#"
 		      >Bar</a
-		      > <a href=""
+		      > <a href="#"
 		      >Y</a
 		      ></span
 		    ></td
 		  ><td class="doc empty"
-		  >&nbsp;</td
+		  ></td
 		  ></tr
 		></table
 	      ></div
@@ -231,11 +226,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeFamilies2.html");}
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/TypeOperators.html b/html-test/ref/TypeOperators.html
index 283083be..a6521437 100644
--- a/html-test/ref/TypeOperators.html
+++ b/html-test/ref/TypeOperators.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >TypeOperators</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeOperators.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -48,7 +49,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a href="" id="t::-45-:" class="def"
+	    > a <a href="#" id="t::-45-:" class="def"
 	    >:-:</a
 	    > b</p
 	  ></div
@@ -56,7 +57,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > (a <a href="" id="t::-43-:" class="def"
+	    > (a <a href="#" id="t::-43-:" class="def"
 	    >:+:</a
 	    > b) c</p
 	  ></div
@@ -64,7 +65,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="" id="t:Op" class="def"
+	    > <a href="#" id="t:Op" class="def"
 	    >Op</a
 	    > a b</p
 	  ></div
@@ -72,7 +73,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="" id="t:O" class="def"
+	    > <a href="#" id="t:O" class="def"
 	    >O</a
 	    > g f a</p
 	  ><div class="subs constructors"
@@ -81,11 +82,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="" id="v:O" class="def"
+		><a href="#" id="v:O" class="def"
 		  >O</a
 		  ></td
 		><td class="doc empty"
-		>&nbsp;</td
+		></td
 		></tr
 	      ><tr
 	      ><td colspan="2"
@@ -95,11 +96,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="" id="v:unO" class="def"
+			><a href="#" id="v:unO" class="def"
 			  >unO</a
 			  > :: g (f a)</dfn
 			><div class="doc empty"
-			>&nbsp;</div
+			></div
 			></li
 		      ></ul
 		    ></div
@@ -112,62 +113,58 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > a <a href="" id="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 href="" id="v:biO" class="def"
+	  ><a href="#" id="v:biO" class="def"
 	    >biO</a
-	    > :: (g <a href=""
+	    > :: (g <a href="#"
 	    >`O`</a
 	    > f) a</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:f" class="def"
+	  ><a href="#" id="v:f" class="def"
 	    >f</a
-	    > :: (a ~ b) =&gt; a -&gt; b</p
+	    > :: a ~ b =&gt; a -&gt; b</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="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 href="" id="v:x" class="def"
+	  ><a href="#" id="v:x" class="def"
 	    >x</a
-	    > :: (a <a href=""
+	    > :: (a <a href="#"
 	    >:-:</a
-	    > a) <a href=""
+	    > a) <a href="#"
 	    >&lt;=&gt;</a
-	    > (a <a href=""
+	    > (a <a href="#"
 	    >`Op`</a
 	    > a) =&gt; a</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:y" class="def"
+	  ><a href="#" id="v:y" class="def"
 	    >y</a
-	    > :: (a <a href=""
+	    > :: (a <a href="#"
 	    >&lt;=&gt;</a
-	    > a, (a <a href=""
+	    > a, (a <a href="#"
 	    >`Op`</a
-	    > a) <a href=""
+	    > a) <a href="#"
 	    >&lt;=&gt;</a
 	    > a) =&gt; a</p
 	  ></div
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Unicode.html b/html-test/ref/Unicode.html
index d724ecd7..393973d5 100644
--- a/html-test/ref/Unicode.html
+++ b/html-test/ref/Unicode.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Unicode</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Unicode.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Unicode.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,9 +47,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Unicode.html");};
 	>Synopsis</p
 	><ul id="section.syn" class="hide" onclick="toggleSection('syn')"
 	><li class="src short"
-	  ><a href=""
+	  ><a href="#"
 	    >x</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></li
 	  ></ul
@@ -58,9 +59,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Unicode.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:x" class="def"
+	  ><a href="#" id="v:x" class="def"
 	    >x</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
 	    ></p
 	  ><div class="doc"
@@ -71,11 +72,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Unicode.html");};
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Visible.html b/html-test/ref/Visible.html
index 54a04e86..755eb9cd 100644
--- a/html-test/ref/Visible.html
+++ b/html-test/ref/Visible.html
@@ -1,32 +1,33 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"
      /><title
     >Visible</title
-    ><link href="ocean.css" rel="stylesheet" type="text/css" title="Ocean"
+    ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
      /><script src="haddock-util.js" type="text/javascript"
     ></script
+    ><script src="https://cdn.mathjax.org/mathjax/latest/MathJax.js?config=TeX-AMS-MML_HTMLorMML" type="text/javascript"
+    ></script
     ><script type="text/javascript"
-    >//<![CDATA[
-window.onload = function () {pageLoad();setSynopsis("mini_Visible.html");};
-//]]>
+    >//
+window.onload = function () {pageLoad();setSynopsis(&quot;mini_Visible.html&quot;);};
+//
 </script
     ></head
   ><body
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href=""
+	><a href="#"
 	  >Contents</a
 	  ></li
 	><li
-	><a href=""
+	><a href="#"
 	  >Index</a
 	  ></li
 	></ul
       ><p class="caption empty"
-      >&nbsp;</p
+      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -46,22 +47,18 @@ window.onload = function () {pageLoad();setSynopsis("mini_Visible.html");};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="" id="v:visible" class="def"
+	  ><a href="#" id="v:visible" class="def"
 	    >visible</a
-	    > :: <a href=""
+	    > :: <a href="#"
 	    >Int</a
-	    > -&gt; <a href=""
+	    > -&gt; <a href="#"
 	    >Int</a
 	    ></p
 	  ></div
 	></div
       ></div
     ><div id="footer"
-    ><p
-      >Produced by <a href=""
-	>Haddock</a
-	> version 2.16.2</p
-      ></div
+    ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/hypsrc-test/Main.hs b/hypsrc-test/Main.hs
index 0490be47..d3ab79a8 100644
--- a/hypsrc-test/Main.hs
+++ b/hypsrc-test/Main.hs
@@ -3,6 +3,7 @@
 
 import Data.Char
 import Data.List
+import Data.Function (on)
 
 import System.Environment
 import System.FilePath
@@ -13,9 +14,10 @@ import Test.Haddock.Xhtml
 
 checkConfig :: CheckConfig Xml
 checkConfig = CheckConfig
-    { ccfgRead = \_ input -> strip <$> parseXml input
+    { ccfgRead = parseXml
+    , ccfgClean = \_ -> strip
     , ccfgDump = dumpXml
-    , ccfgEqual = (==)
+    , ccfgEqual = (==) `on` dumpXml
     }
   where
     strip = stripAnchors' . stripLinks' . stripFooter
diff --git a/hypsrc-test/ref/src/Classes.html b/hypsrc-test/ref/src/Classes.html
index 74a7a427..abff8877 100644
--- a/hypsrc-test/ref/src/Classes.html
+++ b/hypsrc-test/ref/src/Classes.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><link rel="stylesheet" type="text/css" href="style.css"
@@ -44,8 +43,8 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >a</span
 	  ></a
@@ -61,19 +60,15 @@
       ></a
       ><span
       >    </span
-      ><a name="bar"
-      ><a href="Classes.html#bar"
-	><span class="hs-identifier"
-	  >bar</span
-	  ></a
-	></a
+      ><span class="hs-identifier"
+      >bar</span
       ><span
       > </span
       ><span class="hs-glyph"
       >::</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -92,12 +87,8 @@
       ></a
       ><span
       >    </span
-      ><a name="baz"
-      ><a href="Classes.html#baz"
-	><span class="hs-identifier"
-	  >baz</span
-	  ></a
-	></a
+      ><span class="hs-identifier"
+      >baz</span
       ><span
       > </span
       ><span class="hs-glyph"
@@ -114,7 +105,7 @@
       > </span
       ><span class="hs-special"
       >(</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -122,7 +113,7 @@
       >,</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -161,7 +152,7 @@
       ></a
       ><span
       >    </span
-      ><a name="local-0"
+      ><a name=""
       ><a href="Classes.html#bar"
 	><span class="hs-identifier"
 	  >bar</span
@@ -182,7 +173,7 @@
       ></a
       ><span
       >    </span
-      ><a name="local-0"
+      ><a name=""
       ><a href="Classes.html#baz"
 	><span class="hs-identifier"
 	  >baz</span
@@ -190,8 +181,8 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >x</span
 	  ></a
@@ -204,7 +195,7 @@
       > </span
       ><span class="hs-special"
       >(</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -212,7 +203,7 @@
       >,</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -240,7 +231,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -257,7 +248,7 @@
       ></a
       ><span
       >    </span
-      ><a name="local-0"
+      ><a name=""
       ><a href="Classes.html#bar"
 	><span class="hs-identifier"
 	  >bar</span
@@ -278,7 +269,7 @@
       ></a
       ><span
       >    </span
-      ><a name="local-0"
+      ><a name=""
       ><a href="Classes.html#baz"
 	><span class="hs-identifier"
 	  >baz</span
@@ -335,7 +326,7 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -353,8 +344,8 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >a</span
 	  ></a
@@ -370,12 +361,8 @@
       ></a
       ><span
       >    </span
-      ><a name="quux"
-      ><a href="Classes.html#quux"
-	><span class="hs-identifier"
-	  >quux</span
-	  ></a
-	></a
+      ><span class="hs-identifier"
+      >quux</span
       ><span
       > </span
       ><span class="hs-glyph"
@@ -384,7 +371,7 @@
       > </span
       ><span class="hs-special"
       >(</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -392,7 +379,7 @@
       >,</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -404,7 +391,7 @@
       >-&gt;</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -415,7 +402,7 @@
       ></a
       ><span
       >    </span
-      ><a name="local-0"
+      ><a name=""
       ><a href="Classes.html#quux"
 	><span class="hs-identifier"
 	  >quux</span
@@ -425,8 +412,8 @@
       > </span
       ><span class="hs-special"
       >(</span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >x</span
 	  ></a
@@ -435,8 +422,8 @@
       >,</span
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >y</span
 	  ></a
@@ -457,7 +444,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -465,7 +452,7 @@
       >,</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -483,12 +470,8 @@
       ></a
       ><span
       >    </span
-      ><a name="norf"
-      ><a href="Classes.html#norf"
-	><span class="hs-identifier"
-	  >norf</span
-	  ></a
-	></a
+      ><span class="hs-identifier"
+      >norf</span
       ><span
       > </span
       ><span class="hs-glyph"
@@ -497,7 +480,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -509,7 +492,7 @@
       >-&gt;</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -520,7 +503,7 @@
       ></a
       ><span
       >    </span
-      ><a name="local-0"
+      ><a name=""
       ><a href="Classes.html#norf"
 	><span class="hs-identifier"
 	  >norf</span
@@ -601,7 +584,7 @@
       ></a
       ><span
       >    </span
-      ><a name="local-0"
+      ><a name=""
       ><a href="Classes.html#norf"
 	><span class="hs-identifier"
 	  >norf</span
@@ -637,7 +620,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -654,7 +637,7 @@
       ></a
       ><span
       >    </span
-      ><a name="local-0"
+      ><a name=""
       ><a href="Classes.html#quux"
 	><span class="hs-identifier"
 	  >quux</span
@@ -703,8 +686,8 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >p</span
 	  ></a
@@ -720,31 +703,27 @@
       ></a
       ><span
       >    </span
-      ><a name="plugh"
-      ><a href="Classes.html#plugh"
-	><span class="hs-identifier"
-	  >plugh</span
-	  ></a
-	></a
+      ><span class="hs-identifier"
+      >plugh</span
       ><span
       > </span
       ><span class="hs-glyph"
       >::</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>p</span
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -754,19 +733,19 @@
       >-&gt;</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>p</span
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>b</span
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>b</span
 	></a
@@ -776,7 +755,7 @@
       >-&gt;</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>p</span
 	></a
@@ -784,7 +763,7 @@
       > </span
       ><span class="hs-special"
       >(</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -794,7 +773,7 @@
       >-&gt;</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>b</span
 	></a
@@ -804,7 +783,7 @@
       > </span
       ><span class="hs-special"
       >(</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>b</span
 	></a
@@ -814,7 +793,7 @@
       >-&gt;</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -853,7 +832,7 @@
       ></a
       ><span
       >    </span
-      ><a name="local-0"
+      ><a name=""
       ><a href="Classes.html#plugh"
 	><span class="hs-identifier"
 	  >plugh</span
@@ -867,8 +846,8 @@
       >Left</span
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >a</span
 	  ></a
@@ -897,7 +876,7 @@
       >const</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>a</span
 	></a
@@ -918,8 +897,8 @@
       >Right</span
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >a</span
 	  ></a
@@ -948,7 +927,7 @@
       >const</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>a</span
 	></a
@@ -973,8 +952,8 @@
       >Left</span
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >b</span
 	  ></a
@@ -999,7 +978,7 @@
       >const</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>b</span
 	></a
@@ -1024,8 +1003,8 @@
       >Right</span
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >b</span
 	  ></a
@@ -1050,7 +1029,7 @@
       >const</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>b</span
 	></a
@@ -1062,4 +1041,4 @@
       ></pre
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/hypsrc-test/ref/src/Constructors.html b/hypsrc-test/ref/src/Constructors.html
index 86a482f6..e35ca0b1 100644
--- a/hypsrc-test/ref/src/Constructors.html
+++ b/hypsrc-test/ref/src/Constructors.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><link rel="stylesheet" type="text/css" href="style.css"
@@ -375,16 +374,16 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >foo</span
 	  ></a
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >n</span
 	  ></a
@@ -405,7 +404,7 @@
       >*</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>n</span
 	></a
@@ -421,7 +420,7 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>foo</span
 	></a
@@ -497,8 +496,8 @@
       >,</span
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >xs</span
 	  ></a
@@ -521,7 +520,7 @@
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>xs</span
 	></a
@@ -552,8 +551,8 @@
       >,</span
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >xs</span
 	  ></a
@@ -580,7 +579,7 @@
       >reverse</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>xs</span
 	></a
@@ -651,8 +650,8 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >x</span
 	  ></a
@@ -669,8 +668,8 @@
       > </span
       ><span class="hs-special"
       >(</span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >f1</span
 	  ></a
@@ -689,8 +688,8 @@
       >_</span
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >n</span
 	  ></a
@@ -707,8 +706,8 @@
       >,</span
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >f2</span
 	  ></a
@@ -723,8 +722,8 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >f3</span
 	  ></a
@@ -750,7 +749,7 @@
       ></a
       ><span
       >    </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x'</span
 	></a
@@ -760,7 +759,7 @@
       >+</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>n</span
 	></a
@@ -776,7 +775,7 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>f1</span
 	></a
@@ -786,13 +785,13 @@
       >+</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>aux</span
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>f3</span
 	></a
@@ -812,16 +811,16 @@
       ></a
       ><span
       >    </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >aux</span
 	  ></a
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >fx</span
 	  ></a
@@ -838,7 +837,7 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>f2</span
 	></a
@@ -854,7 +853,7 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>fx</span
 	></a
@@ -870,7 +869,7 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>f3</span
 	></a
@@ -881,8 +880,8 @@
       ></a
       ><span
       >    </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >x'</span
 	  ></a
@@ -925,7 +924,7 @@
       >$</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -937,4 +936,4 @@
       ></pre
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/hypsrc-test/ref/src/Identifiers.html b/hypsrc-test/ref/src/Identifiers.html
index 7680b3ef..f52db4ab 100644
--- a/hypsrc-test/ref/src/Identifiers.html
+++ b/hypsrc-test/ref/src/Identifiers.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><link rel="stylesheet" type="text/css" href="style.css"
@@ -83,16 +82,16 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >x</span
 	  ></a
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >y</span
 	  ></a
@@ -103,7 +102,7 @@
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -113,7 +112,7 @@
       >+</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -129,13 +128,13 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -145,7 +144,7 @@
       >*</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -155,7 +154,7 @@
       >+</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -172,16 +171,16 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >x</span
 	  ></a
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >y</span
 	  ></a
@@ -192,7 +191,7 @@
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -202,7 +201,7 @@
       >+</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -218,13 +217,13 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -234,7 +233,7 @@
       >-</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -244,7 +243,7 @@
       >+</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -261,16 +260,16 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >x</span
 	  ></a
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >y</span
 	  ></a
@@ -281,7 +280,7 @@
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -291,7 +290,7 @@
       >*</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -301,7 +300,7 @@
       >*</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -311,7 +310,7 @@
       >*</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -321,7 +320,7 @@
       >*</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -366,8 +365,8 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >x</span
 	  ></a
@@ -392,13 +391,13 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -414,13 +413,13 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -483,24 +482,24 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >x</span
 	  ></a
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >y</span
 	  ></a
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >z</span
 	  ></a
@@ -516,7 +515,7 @@
       >|</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -540,7 +539,7 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -555,7 +554,7 @@
       >|</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -579,7 +578,7 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -594,7 +593,7 @@
       >|</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>z</span
 	></a
@@ -618,7 +617,7 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>z</span
 	></a
@@ -651,7 +650,7 @@
       >(</span
       ><span class="hs-glyph"
       >-</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -663,7 +662,7 @@
       >(</span
       ><span class="hs-glyph"
       >-</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -675,7 +674,7 @@
       >(</span
       ><span class="hs-glyph"
       >-</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>z</span
 	></a
@@ -760,13 +759,13 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -799,7 +798,7 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>z</span
 	></a
@@ -836,19 +835,19 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>z</span
 	></a
@@ -868,8 +867,8 @@
       ></a
       ><span
       >    </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >x</span
 	  ></a
@@ -889,8 +888,8 @@
       ></a
       ><span
       >    </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >y</span
 	  ></a
@@ -910,8 +909,8 @@
       ></a
       ><span
       >    </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >z</span
 	  ></a
@@ -932,4 +931,4 @@
       ></pre
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/hypsrc-test/ref/src/Literals.html b/hypsrc-test/ref/src/Literals.html
index a009a502..dfcefc97 100644
--- a/hypsrc-test/ref/src/Literals.html
+++ b/hypsrc-test/ref/src/Literals.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><link rel="stylesheet" type="text/css" href="style.css"
@@ -83,7 +82,7 @@
       >Num</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -93,7 +92,7 @@
       >=&gt;</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -170,7 +169,7 @@
       >Fractional</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -180,7 +179,7 @@
       >=&gt;</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -229,7 +228,7 @@
       >[</span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -425,4 +424,4 @@
       ></pre
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/hypsrc-test/ref/src/Operators.html b/hypsrc-test/ref/src/Operators.html
index fe690db2..8ce0b9ce 100644
--- a/hypsrc-test/ref/src/Operators.html
+++ b/hypsrc-test/ref/src/Operators.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><link rel="stylesheet" type="text/css" href="style.css"
@@ -46,7 +45,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -60,7 +59,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -74,7 +73,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -85,8 +84,8 @@
 </span
       ><a name="line-5"
       ></a
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >a</span
 	  ></a
@@ -101,8 +100,8 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >b</span
 	  ></a
@@ -113,7 +112,7 @@
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>a</span
 	></a
@@ -123,7 +122,7 @@
       >++</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>b</span
 	></a
@@ -133,7 +132,7 @@
       >++</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>a</span
 	></a
@@ -161,7 +160,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -175,7 +174,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -189,7 +188,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -200,8 +199,8 @@
 </span
       ><a name="line-8"
       ></a
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >a</span
 	  ></a
@@ -216,8 +215,8 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >b</span
 	  ></a
@@ -228,7 +227,7 @@
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>b</span
 	></a
@@ -240,7 +239,7 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>a</span
 	></a
@@ -268,7 +267,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -282,7 +281,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -296,7 +295,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -319,8 +318,8 @@
       >)</span
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >a</span
 	  ></a
@@ -337,7 +336,7 @@
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>a</span
 	></a
@@ -354,8 +353,8 @@
       >)</span
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >a</span
 	  ></a
@@ -368,8 +367,8 @@
       >_</span
       ><span class="hs-glyph"
       >:</span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >b</span
 	  ></a
@@ -382,7 +381,7 @@
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>a</span
 	></a
@@ -396,7 +395,7 @@
       > </span
       ><span class="hs-special"
       >(</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>a</span
 	></a
@@ -408,7 +407,7 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>b</span
 	></a
@@ -440,7 +439,7 @@
       >[</span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -456,7 +455,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -470,7 +469,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -481,8 +480,8 @@
 </span
       ><a name="line-15"
       ></a
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >a</span
 	  ></a
@@ -497,8 +496,8 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >b</span
 	  ></a
@@ -521,7 +520,7 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>b</span
 	></a
@@ -529,7 +528,7 @@
       >)</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>a</span
 	></a
@@ -559,7 +558,7 @@
       >[</span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -577,7 +576,7 @@
       >[</span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -595,7 +594,7 @@
       >[</span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -608,8 +607,8 @@
 </span
       ><a name="line-18"
       ></a
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >a</span
 	  ></a
@@ -624,8 +623,8 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >b</span
 	  ></a
@@ -652,7 +651,7 @@
       > </span
       ><span class="hs-special"
       >[</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>a</span
 	></a
@@ -664,7 +663,7 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>b</span
 	></a
@@ -674,7 +673,7 @@
       > </span
       ><span class="hs-special"
       >(</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>a</span
 	></a
@@ -686,7 +685,7 @@
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>b</span
 	></a
@@ -719,7 +718,7 @@
       >::</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -729,7 +728,7 @@
       >-&gt;</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>b</span
 	></a
@@ -741,7 +740,7 @@
       > </span
       ><span class="hs-special"
       >(</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>c</span
 	></a
@@ -753,7 +752,7 @@
       > </span
       ><span class="hs-special"
       >(</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>a</span
 	></a
@@ -761,7 +760,7 @@
       >,</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-type"
 	>b</span
 	></a
@@ -774,8 +773,8 @@
 </span
       ><a name="line-22"
       ></a
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >a</span
 	  ></a
@@ -790,8 +789,8 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >b</span
 	  ></a
@@ -812,7 +811,7 @@
       > </span
       ><span class="hs-special"
       >(</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>a</span
 	></a
@@ -820,7 +819,7 @@
       >,</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>b</span
 	></a
@@ -834,4 +833,4 @@
       ></pre
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/hypsrc-test/ref/src/Polymorphism.html b/hypsrc-test/ref/src/Polymorphism.html
new file mode 100644
index 00000000..602246e0
--- /dev/null
+++ b/hypsrc-test/ref/src/Polymorphism.html
@@ -0,0 +1,2036 @@
+<html xmlns="http://www.w3.org/1999/xhtml"
+><head
+  ><link rel="stylesheet" type="text/css" href="style.css"
+     /><script type="text/javascript" src="highlight.js"
+    ></script
+    ></head
+  ><body
+  ><pre
+    ><span class="hs-pragma"
+      >{-# LANGUAGE RankNTypes #-}</span
+      ><span
+      >
+</span
+      ><a name="line-2"
+      ></a
+      ><span class="hs-pragma"
+      >{-# LANGUAGE ScopedTypeVariables #-}</span
+      ><span
+      >
+</span
+      ><a name="line-3"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-4"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-5"
+      ></a
+      ><span class="hs-keyword"
+      >module</span
+      ><span
+      > </span
+      ><span class="hs-identifier"
+      >Polymorphism</span
+      ><span
+      > </span
+      ><span class="hs-keyword"
+      >where</span
+      ><span
+      >
+</span
+      ><a name="line-6"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-7"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-8"
+      ></a
+      ><span class="hs-identifier"
+      >foo</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-9"
+      ></a
+      ><a name="foo"
+      ><a href="Polymorphism.html#foo"
+	><span class="hs-identifier"
+	  >foo</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-var"
+      >undefined</span
+      ><span
+      >
+</span
+      ><a name="line-10"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-11"
+      ></a
+      ><span class="hs-identifier"
+      >foo'</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><span class="hs-keyword"
+      >forall</span
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >a</span
+	  ></a
+	></a
+      ><span class="hs-operator"
+      >.</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-12"
+      ></a
+      ><a name="foo%27"
+      ><a href="Polymorphism.html#foo%27"
+	><span class="hs-identifier"
+	  >foo'</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-var"
+      >undefined</span
+      ><span
+      >
+</span
+      ><a name="line-13"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-14"
+      ></a
+      ><span class="hs-identifier"
+      >bar</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >,</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      >
+</span
+      ><a name="line-15"
+      ></a
+      ><a name="bar"
+      ><a href="Polymorphism.html#bar"
+	><span class="hs-identifier"
+	  >bar</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-var"
+      >undefined</span
+      ><span
+      >
+</span
+      ><a name="line-16"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-17"
+      ></a
+      ><span class="hs-identifier"
+      >bar'</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><span class="hs-keyword"
+      >forall</span
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >a</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >b</span
+	  ></a
+	></a
+      ><span class="hs-operator"
+      >.</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >,</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      >
+</span
+      ><a name="line-18"
+      ></a
+      ><a name="bar%27"
+      ><a href="Polymorphism.html#bar%27"
+	><span class="hs-identifier"
+	  >bar'</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-var"
+      >undefined</span
+      ><span
+      >
+</span
+      ><a name="line-19"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-20"
+      ></a
+      ><span class="hs-identifier"
+      >baz</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >[</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >]</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-21"
+      ></a
+      ><a name="baz"
+      ><a href="Polymorphism.html#baz"
+	><span class="hs-identifier"
+	  >baz</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-var"
+      >undefined</span
+      ><span
+      >
+</span
+      ><a name="line-22"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-23"
+      ></a
+      ><span class="hs-identifier"
+      >baz'</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><span class="hs-keyword"
+      >forall</span
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >a</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >b</span
+	  ></a
+	></a
+      ><span class="hs-operator"
+      >.</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >[</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >]</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-24"
+      ></a
+      ><a name="baz%27"
+      ><a href="Polymorphism.html#baz%27"
+	><span class="hs-identifier"
+	  >baz'</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-var"
+      >undefined</span
+      ><span
+      >
+</span
+      ><a name="line-25"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-26"
+      ></a
+      ><span class="hs-identifier"
+      >quux</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><span class="hs-keyword"
+      >forall</span
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >a</span
+	  ></a
+	></a
+      ><span class="hs-operator"
+      >.</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-27"
+      ></a
+      ><a name="quux"
+      ><a href="Polymorphism.html#quux"
+	><span class="hs-identifier"
+	  >quux</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >x</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >f</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-var"
+	>f</span
+	></a
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-var"
+	>x</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-28"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-29"
+      ></a
+      ><span class="hs-identifier"
+      >quux'</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><span class="hs-keyword"
+      >forall</span
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >a</span
+	  ></a
+	></a
+      ><span class="hs-operator"
+      >.</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><span class="hs-keyword"
+      >forall</span
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >a</span
+	  ></a
+	></a
+      ><span class="hs-operator"
+      >.</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-30"
+      ></a
+      ><a name="quux%27"
+      ><a href="Polymorphism.html#quux%27"
+	><span class="hs-identifier"
+	  >quux'</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >x</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >f</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-var"
+	>f</span
+	></a
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-var"
+	>x</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-31"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-32"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-33"
+      ></a
+      ><span class="hs-identifier"
+      >num</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-type"
+      >Num</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-34"
+      ></a
+      ><a name="num"
+      ><a href="Polymorphism.html#num"
+	><span class="hs-identifier"
+	  >num</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-var"
+      >undefined</span
+      ><span
+      >
+</span
+      ><a name="line-35"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-36"
+      ></a
+      ><span class="hs-identifier"
+      >num'</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><span class="hs-keyword"
+      >forall</span
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >a</span
+	  ></a
+	></a
+      ><span class="hs-operator"
+      >.</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-type"
+      >Num</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-37"
+      ></a
+      ><a name="num%27"
+      ><a href="Polymorphism.html#num%27"
+	><span class="hs-identifier"
+	  >num'</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-var"
+      >undefined</span
+      ><span
+      >
+</span
+      ><a name="line-38"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-39"
+      ></a
+      ><span class="hs-identifier"
+      >eq</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><span class="hs-identifier hs-type"
+      >Eq</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >,</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-type"
+      >Eq</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >[</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >]</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >[</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >]</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >,</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      >
+</span
+      ><a name="line-40"
+      ></a
+      ><a name="eq"
+      ><a href="Polymorphism.html#eq"
+	><span class="hs-identifier"
+	  >eq</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-var"
+      >undefined</span
+      ><span
+      >
+</span
+      ><a name="line-41"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-42"
+      ></a
+      ><span class="hs-identifier"
+      >eq'</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><span class="hs-keyword"
+      >forall</span
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >a</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >b</span
+	  ></a
+	></a
+      ><span class="hs-operator"
+      >.</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><span class="hs-identifier hs-type"
+      >Eq</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >,</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-type"
+      >Eq</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >[</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >]</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >[</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >]</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >,</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      >
+</span
+      ><a name="line-43"
+      ></a
+      ><a name="eq%27"
+      ><a href="Polymorphism.html#eq%27"
+	><span class="hs-identifier"
+	  >eq'</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-var"
+      >undefined</span
+      ><span
+      >
+</span
+      ><a name="line-44"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-45"
+      ></a
+      ><span class="hs-identifier"
+      >mon</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-type"
+      >Monad</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>m</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>m</span
+	></a
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>m</span
+	></a
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-46"
+      ></a
+      ><a name="mon"
+      ><a href="Polymorphism.html#mon"
+	><span class="hs-identifier"
+	  >mon</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-var"
+      >undefined</span
+      ><span
+      >
+</span
+      ><a name="line-47"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-48"
+      ></a
+      ><span class="hs-identifier"
+      >mon'</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><span class="hs-keyword"
+      >forall</span
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >m</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >a</span
+	  ></a
+	></a
+      ><span class="hs-operator"
+      >.</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-type"
+      >Monad</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>m</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>m</span
+	></a
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>m</span
+	></a
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-49"
+      ></a
+      ><a name="mon%27"
+      ><a href="Polymorphism.html#mon%27"
+	><span class="hs-identifier"
+	  >mon'</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-var"
+      >undefined</span
+      ><span
+      >
+</span
+      ><a name="line-50"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-51"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-52"
+      ></a
+      ><span class="hs-identifier"
+      >norf</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><span class="hs-keyword"
+      >forall</span
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >a</span
+	  ></a
+	></a
+      ><span class="hs-operator"
+      >.</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-type"
+      >Ord</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-53"
+      ></a
+      ><a name="norf"
+      ><a href="Polymorphism.html#norf"
+	><span class="hs-identifier"
+	  >norf</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >x</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >f</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-var"
+	>x</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-54"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-55"
+      ></a
+      ><span class="hs-identifier"
+      >norf'</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><span class="hs-keyword"
+      >forall</span
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >a</span
+	  ></a
+	></a
+      ><span class="hs-operator"
+      >.</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><span class="hs-keyword"
+      >forall</span
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >a</span
+	  ></a
+	></a
+      ><span class="hs-operator"
+      >.</span
+      ><span
+      > </span
+      ><span class="hs-identifier hs-type"
+      >Ord</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-56"
+      ></a
+      ><a name="norf%27"
+      ><a href="Polymorphism.html#norf%27"
+	><span class="hs-identifier"
+	  >norf'</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >x</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >f</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-var"
+	>x</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-57"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-58"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-59"
+      ></a
+      ><span class="hs-identifier"
+      >plugh</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><span class="hs-keyword"
+      >forall</span
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >a</span
+	  ></a
+	></a
+      ><span class="hs-operator"
+      >.</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-60"
+      ></a
+      ><a name="plugh"
+      ><a href="Polymorphism.html#plugh"
+	><span class="hs-identifier"
+	  >plugh</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >x</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-var"
+	>x</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-61"
+      ></a
+      ><span
+      >
+</span
+      ><a name="line-62"
+      ></a
+      ><span class="hs-identifier"
+      >thud</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><span class="hs-keyword"
+      >forall</span
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >a</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >b</span
+	  ></a
+	></a
+      ><span class="hs-operator"
+      >.</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >,</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      >
+</span
+      ><a name="line-63"
+      ></a
+      ><a name="thud"
+      ><a href="Polymorphism.html#thud"
+	><span class="hs-identifier"
+	  >thud</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >f</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >x</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      >
+</span
+      ><a name="line-64"
+      ></a
+      ><span
+      >    </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#"
+      ><span class="hs-identifier hs-var"
+	>x</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >,</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-var"
+	>y</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span class="hs-special"
+      >,</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      >
+</span
+      ><a name="line-65"
+      ></a
+      ><span
+      >  </span
+      ><span class="hs-keyword"
+      >where</span
+      ><span
+      >
+</span
+      ><a name="line-66"
+      ></a
+      ><span
+      >    </span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >y</span
+	  ></a
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >=</span
+      ><span
+      > </span
+      ><span class="hs-special"
+      >(</span
+      ><a href="#"
+      ><span class="hs-identifier hs-var"
+	>f</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>a</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >-&gt;</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span class="hs-special"
+      >)</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-var"
+	>x</span
+	></a
+      ><span
+      > </span
+      ><span class="hs-glyph"
+      >::</span
+      ><span
+      > </span
+      ><a href="#"
+      ><span class="hs-identifier hs-type"
+	>b</span
+	></a
+      ><span
+      >
+</span
+      ><a name="line-67"
+      ></a
+      ></pre
+    ></body
+  ></html
+>
\ No newline at end of file
diff --git a/hypsrc-test/ref/src/Records.html b/hypsrc-test/ref/src/Records.html
index eb4e0fbb..7d23d114 100644
--- a/hypsrc-test/ref/src/Records.html
+++ b/hypsrc-test/ref/src/Records.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><link rel="stylesheet" type="text/css" href="style.css"
@@ -197,16 +196,16 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >x</span
 	  ></a
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >y</span
 	  ></a
@@ -227,17 +226,15 @@
       >{</span
       ><span
       > </span
-      ><a href="Records.html#x"
-      ><span class="hs-identifier hs-var"
-	>x</span
-	></a
+      ><span class="hs-identifier"
+      >x</span
       ><span
       > </span
       ><span class="hs-glyph"
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -245,17 +242,15 @@
       >,</span
       ><span
       > </span
-      ><a href="Records.html#y"
-      ><span class="hs-identifier hs-var"
-	>y</span
-	></a
+      ><span class="hs-identifier"
+      >y</span
       ><span
       > </span
       ><span class="hs-glyph"
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -323,18 +318,16 @@
       >{</span
       ><span
       > </span
-      ><a href="Records.html#x"
-      ><span class="hs-identifier hs-var"
-	>x</span
-	></a
+      ><span class="hs-identifier"
+      >x</span
       ><span
       > </span
       ><span class="hs-glyph"
       >=</span
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >x</span
 	  ></a
@@ -343,18 +336,16 @@
       >,</span
       ><span
       > </span
-      ><a href="Records.html#y"
-      ><span class="hs-identifier hs-var"
-	>y</span
-	></a
+      ><span class="hs-identifier"
+      >y</span
       ><span
       > </span
       ><span class="hs-glyph"
       >=</span
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >y</span
 	  ></a
@@ -371,7 +362,7 @@
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -381,7 +372,7 @@
       >*</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -391,7 +382,7 @@
       >+</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -401,7 +392,7 @@
       >*</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -460,17 +451,21 @@
       >{</span
       ><span
       > </span
-      ><a href="Records.html#x"
-      ><span class="hs-identifier hs-var"
-	>x</span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >x</span
+	  ></a
 	></a
       ><span class="hs-special"
       >,</span
       ><span
       > </span
-      ><a href="Records.html#y"
-      ><span class="hs-identifier hs-var"
-	>y</span
+      ><a name=""
+      ><a href="#"
+	><span class="hs-identifier"
+	  >y</span
+	  ></a
 	></a
       ><span
       > </span
@@ -484,7 +479,7 @@
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -494,7 +489,7 @@
       >*</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -504,7 +499,7 @@
       >+</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -514,7 +509,7 @@
       >*</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -582,16 +577,16 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >p</span
 	  ></a
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >d</span
 	  ></a
@@ -602,7 +597,7 @@
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>p</span
 	></a
@@ -612,23 +607,19 @@
       >{</span
       ><span
       > </span
-      ><a href="Records.html#x"
-      ><span class="hs-identifier hs-var"
-	>x</span
-	></a
+      ><span class="hs-identifier"
+      >x</span
       ><span
       > </span
       ><span class="hs-glyph"
       >=</span
       ><span
       > </span
-      ><a href="Records.html#x"
-      ><span class="hs-identifier hs-var"
-	>x</span
-	></a
+      ><span class="hs-identifier"
+      >x</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>p</span
 	></a
@@ -638,7 +629,7 @@
       >+</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>d</span
 	></a
@@ -659,16 +650,16 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >p</span
 	  ></a
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >d</span
 	  ></a
@@ -679,7 +670,7 @@
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>p</span
 	></a
@@ -689,23 +680,19 @@
       >{</span
       ><span
       > </span
-      ><a href="Records.html#y"
-      ><span class="hs-identifier hs-var"
-	>y</span
-	></a
+      ><span class="hs-identifier"
+      >y</span
       ><span
       > </span
       ><span class="hs-glyph"
       >=</span
       ><span
       > </span
-      ><a href="Records.html#y"
-      ><span class="hs-identifier hs-var"
-	>y</span
-	></a
+      ><span class="hs-identifier"
+      >y</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>p</span
 	></a
@@ -715,7 +702,7 @@
       >+</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>d</span
 	></a
@@ -784,24 +771,24 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >x</span
 	  ></a
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >y</span
 	  ></a
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >p</span
 	  ></a
@@ -817,13 +804,13 @@
       ></a
       ><span
       >    </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>aux</span
 	></a
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>p</span
 	></a
@@ -845,8 +832,8 @@
       >    </span
       ><span class="hs-special"
       >(</span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >dx</span
 	  ></a
@@ -855,8 +842,8 @@
       >,</span
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >dy</span
 	  ></a
@@ -871,7 +858,7 @@
       > </span
       ><span class="hs-special"
       >(</span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -879,7 +866,7 @@
       >,</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -892,8 +879,8 @@
       ></a
       ><span
       >    </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >aux</span
 	  ></a
@@ -916,7 +903,7 @@
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>p</span
 	></a
@@ -926,17 +913,15 @@
       >{</span
       ><span
       > </span
-      ><a href="Records.html#x"
-      ><span class="hs-identifier hs-var"
-	>x</span
-	></a
+      ><span class="hs-identifier"
+      >x</span
       ><span
       > </span
       ><span class="hs-glyph"
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>x</span
 	></a
@@ -946,7 +931,7 @@
       >+</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>dx</span
 	></a
@@ -954,17 +939,15 @@
       >,</span
       ><span
       > </span
-      ><a href="Records.html#y"
-      ><span class="hs-identifier hs-var"
-	>y</span
-	></a
+      ><span class="hs-identifier"
+      >y</span
       ><span
       > </span
       ><span class="hs-glyph"
       >=</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>y</span
 	></a
@@ -974,7 +957,7 @@
       >+</span
       ><span
       > </span
-      ><a href="#local-0"
+      ><a href="#"
       ><span class="hs-identifier hs-var"
 	>dy</span
 	></a
@@ -990,4 +973,4 @@
       ></pre
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/hypsrc-test/ref/src/Types.html b/hypsrc-test/ref/src/Types.html
index d59f61f8..a8be9e78 100644
--- a/hypsrc-test/ref/src/Types.html
+++ b/hypsrc-test/ref/src/Types.html
@@ -1,4 +1,3 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml"
 ><head
   ><link rel="stylesheet" type="text/css" href="style.css"
@@ -231,16 +230,16 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >a</span
 	  ></a
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >b</span
 	  ></a
@@ -387,16 +386,16 @@
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >a</span
 	  ></a
 	></a
       ><span
       > </span
-      ><a name="local-0"
-      ><a href="#local-0"
+      ><a name=""
+      ><a href="#"
 	><span class="hs-identifier"
 	  >b</span
 	  ></a
@@ -1054,4 +1053,4 @@
       ></pre
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/hypsrc-test/src/Polymorphism.hs b/hypsrc-test/src/Polymorphism.hs
index a74ac492..3f0103bf 100644
--- a/hypsrc-test/src/Polymorphism.hs
+++ b/hypsrc-test/src/Polymorphism.hs
@@ -24,10 +24,10 @@ baz' :: forall a b. a -> (a -> [a -> a] -> b) -> b
 baz' = undefined
 
 quux :: a -> (forall a. a -> a) -> a
-quux = undefined
+quux x f = f x
 
 quux' :: forall a. a -> (forall a. a -> a) -> a
-quux' = undefined
+quux' x f = f x
 
 
 num :: Num a => a -> a -> a
@@ -50,10 +50,10 @@ mon' = undefined
 
 
 norf :: a -> (forall a. Ord a => a -> a) -> a
-norf = undefined
+norf x f = x
 
 norf' :: forall a. a -> (forall a. Ord a => a -> a) -> a
-norf' = undefined
+norf' x f = x
 
 
 plugh :: forall a. a -> a
diff --git a/latex-test/Main.hs b/latex-test/Main.hs
index 2ee01a26..5989410b 100755
--- a/latex-test/Main.hs
+++ b/latex-test/Main.hs
@@ -9,7 +9,8 @@ import Test.Haddock
 
 checkConfig :: CheckConfig String
 checkConfig = CheckConfig
-    { ccfgRead = \_ input -> Just input
+    { ccfgRead = Just
+    , ccfgClean = \_ -> id
     , ccfgDump = id
     , ccfgEqual = (==)
     }