Fix extra whitespace on signatures and update all test cases

This was long overdue, now running ./accept.lhs on a clean test from
master will not generate a bunch of changes.

33 files changed, 200 insertions, 108 deletions

diff --git a/html-test/ref/Bold.html b/html-test/ref/Bold.html
index d936a720..7151862d 100644
--- a/html-test/ref/Bold.html
+++ b/html-test/ref/Bold.html
@@ -17,11 +17,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bold.html");};
   ><div id="package-header"
     ><ul class="links" id="page-menu"
       ><li
-	><a href="index.html"
+	><a href=""
 	  >Contents</a
 	  ></li
 	><li
-	><a href="doc-index.html"
+	><a href=""
 	  >Index</a
 	  ></li
 	></ul
@@ -46,9 +46,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="#v:foo"
+	  ><a href=""
 	    >foo</a
-	    > ::  t</li
+	    > :: t</li
 	  ></ul
 	></div
       ><div id="interface"
@@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bold.html");};
 	><p class="src"
 	  ><a name="v:foo" class="def"
 	    >foo</a
-	    > ::  t</p
+	    > :: t</p
 	  ><div class="doc"
 	  ><p
 	    >Some <strong
@@ -90,7 +90,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bold.html");};
       ></div
     ><div id="footer"
     ><p
-      >Produced by <a href="http://www.haskell.org/haddock/"
+      >Produced by <a href=""
 	>Haddock</a
 	> version 2.15.0</p
       ></div
diff --git a/html-test/ref/Bug298.html b/html-test/ref/Bug298.html
index 03ed5eeb..040eccc4 100644
--- a/html-test/ref/Bug298.html
+++ b/html-test/ref/Bug298.html
@@ -48,19 +48,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug298.html");};
 	><li class="src short"
 	  ><a href=""
 	    >(&lt;^&gt;)</a
-	    > ::  (a -&gt; a) -&gt; a -&gt; a</li
+	    > :: (a -&gt; a) -&gt; a -&gt; a</li
 	  ><li class="src short"
 	  ><a href=""
 	    >(&lt;^)</a
-	    > ::  a -&gt; a -&gt; a</li
+	    > :: a -&gt; a -&gt; a</li
 	  ><li class="src short"
 	  ><a href=""
 	    >(^&gt;)</a
-	    > ::  a -&gt; a -&gt; a</li
+	    > :: a -&gt; a -&gt; a</li
 	  ><li class="src short"
 	  ><a href=""
 	    >(&#8902;^)</a
-	    > ::  a -&gt; a -&gt; a</li
+	    > :: a -&gt; a -&gt; a</li
 	  ><li class="src short"
 	  ><a href=""
 	    >f</a
@@ -74,25 +74,25 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug298.html");};
 	><p class="src"
 	  ><a name="v:-60--94--62-" class="def"
 	    >(&lt;^&gt;)</a
-	    > ::  (a -&gt; a) -&gt; a -&gt; a</p
+	    > :: (a -&gt; a) -&gt; a -&gt; a</p
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><a name="v:-60--94-" class="def"
 	    >(&lt;^)</a
-	    > ::  a -&gt; a -&gt; a</p
+	    > :: a -&gt; a -&gt; a</p
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><a name="v:-94--62-" class="def"
 	    >(^&gt;)</a
-	    > ::  a -&gt; a -&gt; a</p
+	    > :: a -&gt; a -&gt; a</p
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><a name="v:-8902--94-" class="def"
 	    >(&#8902;^)</a
-	    > ::  a -&gt; a -&gt; a</p
+	    > :: a -&gt; a -&gt; a</p
 	  ></div
 	><div class="top"
 	><p class="src"
diff --git a/html-test/ref/Bug313.html b/html-test/ref/Bug313.html
index a3a03b0e..5fa34eff 100644
--- a/html-test/ref/Bug313.html
+++ b/html-test/ref/Bug313.html
@@ -61,11 +61,11 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug313.html");};
 	><li class="src short"
 	  ><a href=""
 	    >a</a
-	    > ::  a</li
+	    > :: a</li
 	  ><li class="src short"
 	  ><a href=""
 	    >b</a
-	    > ::  a</li
+	    > :: a</li
 	  ></ul
 	></div
       ><div id="interface"
@@ -75,7 +75,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug313.html");};
 	><p class="src"
 	  ><a name="v:a" class="def"
 	    >a</a
-	    > ::  a</p
+	    > :: a</p
 	  ><div class="doc"
 	  ><p
 	    >Some text.</p
@@ -99,7 +99,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug313.html");};
 	><p class="src"
 	  ><a name="v:b" class="def"
 	    >b</a
-	    > ::  a</p
+	    > :: a</p
 	  ><div class="doc"
 	  ><p
 	    >Some text.</p
diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html
index 3bb044c1..288ee9f5 100644
--- a/html-test/ref/Bug8.html
+++ b/html-test/ref/Bug8.html
@@ -86,7 +86,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 	><p class="src"
 	  ><a name="v:-45--45--62-" class="def"
 	    >(--&gt;)</a
-	    > ::  t -&gt; t1 -&gt; <a href="Bug8.html#t:Typ"
+	    > :: t -&gt; t1 -&gt; <a href=""
 	    >Typ</a
 	    > <span class="fixity"
 	    >infix 9</span
@@ -98,9 +98,9 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 	><p class="src"
 	  ><a name="v:-45--45--45--62-" class="def"
 	    >(---&gt;)</a
-	    > ::  [a] -&gt; <a href="Bug8.html#t:Typ"
+	    > :: [a] -&gt; <a href=""
 	    >Typ</a
-	    > -&gt; <a href="Bug8.html#t:Typ"
+	    > -&gt; <a href=""
 	    >Typ</a
 	    > <span class="fixity"
 	    >infix 9</span
@@ -112,19 +112,19 @@ window.onload = function () {pageLoad();setSynopsis("mini_Bug8.html");};
 	><p class="src"
 	  ><a name="v:s" class="def"
 	    >s</a
-	    > ::  t</p
+	    > :: t</p
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><a name="v:t" class="def"
 	    >t</a
-	    > ::  t</p
+	    > :: t</p
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><a name="v:main" class="def"
 	    >main</a
-	    > ::  t</p
+	    > :: t</p
 	  ></div
 	></div
       ></div
diff --git a/html-test/ref/Extensions.html b/html-test/ref/Extensions.html
index ba2af28f..b2acb26e 100644
--- a/html-test/ref/Extensions.html
+++ b/html-test/ref/Extensions.html
@@ -60,7 +60,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Extensions.html");};
 	><li class="src short"
 	  ><a href=""
 	    >foobar</a
-	    > ::  t</li
+	    > :: t</li
 	  ></ul
 	></div
       ><div id="interface"
@@ -70,7 +70,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Extensions.html");};
 	><p class="src"
 	  ><a name="v:foobar" class="def"
 	    >foobar</a
-	    > ::  t</p
+	    > :: t</p
 	  ><div class="doc"
 	  ><p
 	    >Bar</p
diff --git a/html-test/ref/ImplicitParams.html b/html-test/ref/ImplicitParams.html
index 9bd826d6..3874af26 100644
--- a/html-test/ref/ImplicitParams.html
+++ b/html-test/ref/ImplicitParams.html
@@ -94,7 +94,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_ImplicitParams.html");
 	><p class="src"
 	  ><a name="v:f" class="def"
 	    >f</a
-	    > ::  ((?x :: <a href=""
+	    > :: ((?x :: <a href=""
 	    >X</a
 	    >) =&gt; a) -&gt; a</p
 	  ></div
diff --git a/html-test/ref/Nesting.html b/html-test/ref/Nesting.html
index e3302d8f..2b0befba 100644
--- a/html-test/ref/Nesting.html
+++ b/html-test/ref/Nesting.html
@@ -48,31 +48,31 @@ window.onload = function () {pageLoad();setSynopsis("mini_Nesting.html");};
 	><li class="src short"
 	  ><a href=""
 	    >d</a
-	    > ::  t</li
+	    > :: t</li
 	  ><li class="src short"
 	  ><a href=""
 	    >e</a
-	    > ::  t</li
+	    > :: t</li
 	  ><li class="src short"
 	  ><a href=""
 	    >f</a
-	    > ::  t</li
+	    > :: t</li
 	  ><li class="src short"
 	  ><a href=""
 	    >g</a
-	    > ::  t</li
+	    > :: t</li
 	  ><li class="src short"
 	  ><a href=""
 	    >h</a
-	    > ::  t</li
+	    > :: t</li
 	  ><li class="src short"
 	  ><a href=""
 	    >i</a
-	    > ::  t</li
+	    > :: t</li
 	  ><li class="src short"
 	  ><a href=""
 	    >j</a
-	    > ::  t</li
+	    > :: t</li
 	  ></ul
 	></div
       ><div id="interface"
@@ -82,7 +82,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Nesting.html");};
 	><p class="src"
 	  ><a name="v:d" class="def"
 	    >d</a
-	    > ::  t</p
+	    > :: t</p
 	  ><div class="doc"
 	  ><ul
 	    ><li
@@ -114,7 +114,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Nesting.html");};
 	><p class="src"
 	  ><a name="v:e" class="def"
 	    >e</a
-	    > ::  t</p
+	    > :: t</p
 	  ><div class="doc"
 	  ><ul
 	    ><li
@@ -135,7 +135,7 @@ the presence of this text pushes it out of nesting back to the top.</li
 	><p class="src"
 	  ><a name="v:f" class="def"
 	    >f</a
-	    > ::  t</p
+	    > :: t</p
 	  ><div class="doc"
 	  ><ul
 	    ><li
@@ -153,7 +153,7 @@ the presence of this text pushes it out of nesting back to the top.</li
 	><p class="src"
 	  ><a name="v:g" class="def"
 	    >g</a
-	    > ::  t</p
+	    > :: t</p
 	  ><div class="doc"
 	  ><ul
 	    ><li
@@ -171,7 +171,7 @@ the presence of this text pushes it out of nesting back to the top.</li
 	><p class="src"
 	  ><a name="v:h" class="def"
 	    >h</a
-	    > ::  t</p
+	    > :: t</p
 	  ><div class="doc"
 	  ><ul
 	    ><li
@@ -189,7 +189,7 @@ tracks</pre
 	><p class="src"
 	  ><a name="v:i" class="def"
 	    >i</a
-	    > ::  t</p
+	    > :: t</p
 	  ><div class="doc"
 	  ><ul
 	    ><li
@@ -239,7 +239,7 @@ More of the indented list.</p
 	><p class="src"
 	  ><a name="v:j" class="def"
 	    >j</a
-	    > ::  t</p
+	    > :: t</p
 	  ><div class="doc"
 	  ><dl
 	    ><dt
diff --git a/html-test/ref/NonGreedy.html b/html-test/ref/NonGreedy.html
index ceede7cb..91deb281 100644
--- a/html-test/ref/NonGreedy.html
+++ b/html-test/ref/NonGreedy.html
@@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");};
 	><li class="src short"
 	  ><a href=""
 	    >f</a
-	    > ::  a</li
+	    > :: a</li
 	  ></ul
 	></div
       ><div id="interface"
@@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_NonGreedy.html");};
 	><p class="src"
 	  ><a name="v:f" class="def"
 	    >f</a
-	    > ::  a</p
+	    > :: a</p
 	  ><div class="doc"
 	  ><p
 	    ><a href=""
diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index fac8c94d..67cc8ed5 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -56,15 +56,15 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><li class="src short"
 	  ><a href=""
 	    >(+-)</a
-	    > ::  a -&gt; a -&gt; a</li
+	    > :: a -&gt; a -&gt; a</li
 	  ><li class="src short"
 	  ><a href=""
 	    >(*/)</a
-	    > ::  a -&gt; a -&gt; a</li
+	    > :: a -&gt; a -&gt; a</li
 	  ><li class="src short"
 	  ><a href=""
 	    >foo</a
-	    > ::  a -&gt; a -&gt; a</li
+	    > :: a -&gt; a -&gt; a</li
 	  ><li class="src short"
 	  ><span class="keyword"
 	    >data</span
@@ -176,7 +176,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><a name="v:-43--45-" class="def"
 	    >(+-)</a
-	    > ::  a -&gt; a -&gt; a</p
+	    > :: a -&gt; a -&gt; a</p
 	  ><div class="doc"
 	  ><p
 	    >Operator with no fixity</p
@@ -186,7 +186,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><a name="v:-42--47-" class="def"
 	    >(*/)</a
-	    > ::  a -&gt; a -&gt; a <span class="fixity"
+	    > :: a -&gt; a -&gt; a <span class="fixity"
 	    >infixr 7</span
 	    ><span class="rightedge"
 	    ></span
@@ -200,7 +200,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
 	><p class="src"
 	  ><a name="v:foo" class="def"
 	    >foo</a
-	    > ::  a -&gt; a -&gt; a <span class="fixity"
+	    > :: a -&gt; a -&gt; a <span class="fixity"
 	    >infixl 3</span
 	    ><span class="rightedge"
 	    ></span
@@ -450,7 +450,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Operators.html");};
     ><p
       >Produced by <a href=""
 	>Haddock</a
-	> version 2.14.4</p
+	> version 2.15.0</p
       ></div
     ></body
   ></html
diff --git a/html-test/ref/TH2.html b/html-test/ref/TH2.html
index 2cd886bb..61145958 100644
--- a/html-test/ref/TH2.html
+++ b/html-test/ref/TH2.html
@@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TH2.html");};
 	><p class="src"
 	  ><a name="v:f" class="def"
 	    >f</a
-	    > ::  t -&gt; t</p
+	    > :: t -&gt; t</p
 	  ></div
 	></div
       ></div
diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index fcad8657..89491f01 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -487,7 +487,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><li
 	      ><a href=""
 		>d</a
-		> ::  <a href=""
+		> :: <a href=""
 		>T</a
 		> a b</li
 	      ><li
@@ -657,7 +657,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	  ><li class="src short"
 	  ><a href=""
 	    >withoutType</a
-	    > ::  t</li
+	    > :: t</li
 	  ></ul
 	></div
       ><div id="interface"
@@ -1535,7 +1535,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Test.html");};
 	    ><p class="src"
 	    ><a name="v:d" class="def"
 	      >d</a
-	      > ::  <a href=""
+	      > :: <a href=""
 	      >T</a
 	      > a b</p
 	    ><p class="src"
@@ -2130,7 +2130,7 @@ is at the beginning of the line).</pre
 	><p class="src"
 	  ><a name="v:withoutType" class="def"
 	    >withoutType</a
-	    > ::  t</p
+	    > :: t</p
 	  ><div class="doc"
 	  ><p
 	    >Comment on a definition without type signature</p
diff --git a/html-test/ref/Ticket112.html b/html-test/ref/Ticket112.html
index 9c3932cf..528787c7 100644
--- a/html-test/ref/Ticket112.html
+++ b/html-test/ref/Ticket112.html
@@ -48,7 +48,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");};
 	><li class="src short"
 	  ><a href=""
 	    >f</a
-	    > ::  a</li
+	    > :: a</li
 	  ></ul
 	></div
       ><div id="interface"
@@ -58,7 +58,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_Ticket112.html");};
 	><p class="src"
 	  ><a name="v:f" class="def"
 	    >f</a
-	    > ::  a</p
+	    > :: a</p
 	  ><div class="doc"
 	  ><p
 	    >...given a raw <code
diff --git a/html-test/ref/TypeOperators.html b/html-test/ref/TypeOperators.html
index 1a53b8ec..2e80bf9f 100644
--- a/html-test/ref/TypeOperators.html
+++ b/html-test/ref/TypeOperators.html
@@ -120,7 +120,7 @@ window.onload = function () {pageLoad();setSynopsis("mini_TypeOperators.html");}
 	><p class="src"
 	  ><a name="v:biO" class="def"
 	    >biO</a
-	    > ::  (g <a href=""
+	    > :: (g <a href=""
 	    >`O`</a
 	    > f) a</p
 	  ></div
diff --git a/html-test/ref/mini_A.html b/html-test/ref/mini_A.html
index cbe50e41..c3d36935 100644
--- a/html-test/ref/mini_A.html
+++ b/html-test/ref/mini_A.html
@@ -25,7 +25,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >A</a
-	  > </p
+	  ></p
 	></div
       ><div class="top"
       ><p class="src"
@@ -45,7 +45,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >X</a
-	  > </p
+	  ></p
 	></div
       ><div class="top"
       ><p class="src"
diff --git a/html-test/ref/mini_AdvanceTypes.html b/html-test/ref/mini_AdvanceTypes.html
index 59d8dcb1..c4b0806a 100644
--- a/html-test/ref/mini_AdvanceTypes.html
+++ b/html-test/ref/mini_AdvanceTypes.html
@@ -25,7 +25,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >Pattern</a
-	  > </p
+	  ></p
 	></div
       ></div
     ></body
diff --git a/html-test/ref/mini_B.html b/html-test/ref/mini_B.html
index 211a7deb..9b3ef381 100644
--- a/html-test/ref/mini_B.html
+++ b/html-test/ref/mini_B.html
@@ -37,7 +37,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >X</a
-	  > </p
+	  ></p
 	></div
       ></div
     ></body
diff --git a/html-test/ref/mini_Bug1.html b/html-test/ref/mini_Bug1.html
index adf81c73..bab3748c 100644
--- a/html-test/ref/mini_Bug1.html
+++ b/html-test/ref/mini_Bug1.html
@@ -25,7 +25,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >T</a
-	  > </p
+	  ></p
 	></div
       ></div
     ></body
diff --git a/html-test/ref/mini_Bug6.html b/html-test/ref/mini_Bug6.html
index 5c5c1119..e448e7a3 100644
--- a/html-test/ref/mini_Bug6.html
+++ b/html-test/ref/mini_Bug6.html
@@ -25,7 +25,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >A</a
-	  > </p
+	  ></p
 	></div
       ><div class="top"
       ><p class="src"
@@ -33,7 +33,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >B</a
-	  > </p
+	  ></p
 	></div
       ><div class="top"
       ><p class="src"
@@ -41,7 +41,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >C</a
-	  > </p
+	  ></p
 	></div
       ><div class="top"
       ><p class="src"
@@ -49,7 +49,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >D</a
-	  > </p
+	  ></p
 	></div
       ><div class="top"
       ><p class="src"
@@ -57,7 +57,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >E</a
-	  > </p
+	  ></p
 	></div
       ></div
     ></body
diff --git a/html-test/ref/mini_Bug7.html b/html-test/ref/mini_Bug7.html
index 1bec82ee..2cb7ebe1 100644
--- a/html-test/ref/mini_Bug7.html
+++ b/html-test/ref/mini_Bug7.html
@@ -25,7 +25,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >Foo</a
-	  > </p
+	  ></p
 	></div
       ><div class="top"
       ><p class="src"
diff --git a/html-test/ref/mini_Bug8.html b/html-test/ref/mini_Bug8.html
index 070dbcf8..ca6ec68a 100644
--- a/html-test/ref/mini_Bug8.html
+++ b/html-test/ref/mini_Bug8.html
@@ -25,7 +25,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >Typ</a
-	  > </p
+	  ></p
 	></div
       ><div class="top"
       ><p class="src"
diff --git a/html-test/ref/mini_BugDeprecated.html b/html-test/ref/mini_BugDeprecated.html
index f0410137..9c8fc229 100644
--- a/html-test/ref/mini_BugDeprecated.html
+++ b/html-test/ref/mini_BugDeprecated.html
@@ -28,13 +28,13 @@ window.onload = function () {pageLoad();};
       ><div class="top"
       ><p class="src"
 	><a href="" target="main"
-	  >baz</a
+	  >bar</a
 	  ></p
 	></div
       ><div class="top"
       ><p class="src"
 	><a href="" target="main"
-	  >bar</a
+	  >baz</a
 	  ></p
 	></div
       ><div class="top"
@@ -46,13 +46,13 @@ window.onload = function () {pageLoad();};
       ><div class="top"
       ><p class="src"
 	><a href="" target="main"
-	  >three</a
+	  >two</a
 	  ></p
 	></div
       ><div class="top"
       ><p class="src"
 	><a href="" target="main"
-	  >two</a
+	  >three</a
 	  ></p
 	></div
       ></div
diff --git a/html-test/ref/mini_DeprecatedData.html b/html-test/ref/mini_DeprecatedData.html
index 8ef20113..7f11afeb 100644
--- a/html-test/ref/mini_DeprecatedData.html
+++ b/html-test/ref/mini_DeprecatedData.html
@@ -25,7 +25,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >Foo</a
-	  > </p
+	  ></p
 	></div
       ><div class="top"
       ><p class="src"
@@ -33,7 +33,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >One</a
-	  > </p
+	  ></p
 	></div
       ></div
     ></body
diff --git a/html-test/ref/mini_DeprecatedNewtype.html b/html-test/ref/mini_DeprecatedNewtype.html
index a913525f..84d41828 100644
--- a/html-test/ref/mini_DeprecatedNewtype.html
+++ b/html-test/ref/mini_DeprecatedNewtype.html
@@ -25,7 +25,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >SomeNewType</a
-	  > </p
+	  ></p
 	></div
       ><div class="top"
       ><p class="src"
@@ -33,7 +33,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >SomeOtherNewType</a
-	  > </p
+	  ></p
 	></div
       ></div
     ></body
diff --git a/html-test/ref/mini_DeprecatedRecord.html b/html-test/ref/mini_DeprecatedRecord.html
index 3d949d2d..54dc9722 100644
--- a/html-test/ref/mini_DeprecatedRecord.html
+++ b/html-test/ref/mini_DeprecatedRecord.html
@@ -25,7 +25,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >Foo</a
-	  > </p
+	  ></p
 	></div
       ></div
     ></body
diff --git a/html-test/ref/mini_DeprecatedTypeSynonym.html b/html-test/ref/mini_DeprecatedTypeSynonym.html
index 5ade100d..c04c374f 100644
--- a/html-test/ref/mini_DeprecatedTypeSynonym.html
+++ b/html-test/ref/mini_DeprecatedTypeSynonym.html
@@ -25,7 +25,7 @@ window.onload = function () {pageLoad();};
 	  >type</span
 	  > <a href="" target="main"
 	  >TypeSyn</a
-	  > </p
+	  ></p
 	></div
       ><div class="top"
       ><p class="src"
@@ -33,7 +33,7 @@ window.onload = function () {pageLoad();};
 	  >type</span
 	  > <a href="" target="main"
 	  >OtherTypeSyn</a
-	  > </p
+	  ></p
 	></div
       ></div
     ></body
diff --git a/html-test/ref/mini_HiddenInstances.html b/html-test/ref/mini_HiddenInstances.html
index 0f1a2e04..01bab320 100644
--- a/html-test/ref/mini_HiddenInstances.html
+++ b/html-test/ref/mini_HiddenInstances.html
@@ -33,7 +33,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >VisibleData</a
-	  > </p
+	  ></p
 	></div
       ></div
     ></body
diff --git a/html-test/ref/mini_HiddenInstancesB.html b/html-test/ref/mini_HiddenInstancesB.html
index 3ce4f6a9..e02b42b1 100644
--- a/html-test/ref/mini_HiddenInstancesB.html
+++ b/html-test/ref/mini_HiddenInstancesB.html
@@ -33,7 +33,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >Bar</a
-	  > </p
+	  ></p
 	></div
       ></div
     ></body
diff --git a/html-test/ref/mini_QuasiExpr.html b/html-test/ref/mini_QuasiExpr.html
index 7dd9b829..06797498 100644
--- a/html-test/ref/mini_QuasiExpr.html
+++ b/html-test/ref/mini_QuasiExpr.html
@@ -25,7 +25,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >Expr</a
-	  > </p
+	  ></p
 	></div
       ><div class="top"
       ><p class="src"
@@ -33,7 +33,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >BinOp</a
-	  > </p
+	  ></p
 	></div
       ><div class="top"
       ><p class="src"
diff --git a/html-test/ref/mini_Test.html b/html-test/ref/mini_Test.html
index 3a01ff1c..7453387c 100644
--- a/html-test/ref/mini_Test.html
+++ b/html-test/ref/mini_Test.html
@@ -69,7 +69,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >T6</a
-	  > </p
+	  ></p
 	></div
       ><div class="top"
       ><p class="src"
@@ -135,7 +135,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >R</a
-	  > </p
+	  ></p
 	></div
       ><div class="top"
       ><p class="src"
@@ -143,7 +143,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >R1</a
-	  > </p
+	  ></p
 	></div
       ><h1
       >Class declarations</h1
diff --git a/html-test/ref/mini_Ticket253_2.html b/html-test/ref/mini_Ticket253_2.html
index 603590a8..ea62c2ad 100644
--- a/html-test/ref/mini_Ticket253_2.html
+++ b/html-test/ref/mini_Ticket253_2.html
@@ -31,7 +31,7 @@ window.onload = function () {pageLoad();};
 	  >data</span
 	  > <a href="" target="main"
 	  >Baz</a
-	  > </p
+	  ></p
 	></div
       ></div
     ></body
diff --git a/html-test/ref/mini_TypeFamilies.html b/html-test/ref/mini_TypeFamilies.html
index 0cf39c88..feb61abc 100644
--- a/html-test/ref/mini_TypeFamilies.html
+++ b/html-test/ref/mini_TypeFamilies.html
@@ -22,9 +22,49 @@ window.onload = function () {pageLoad();};
     ><div class="top"
       ><p class="src"
 	><span class="keyword"
+	  >data</span
+	  > <a href="" target="main"
+	  >X</a
+	  ></p
+	></div
+      ><div class="top"
+      ><p class="src"
+	><span class="keyword"
+	  >data</span
+	  > <a href="" target="main"
+	  >Y</a
+	  ></p
+	></div
+      ><div class="top"
+      ><p class="src"
+	><span class="keyword"
+	  >data</span
+	  > <a href="" target="main"
+	  >Z</a
+	  ></p
+	></div
+      ><div class="top"
+      ><p class="src"
+	><span class="keyword"
+	  >class</span
+	  > <a href="" target="main"
+	  >Test</a
+	  > a</p
+	></div
+      ><div class="top"
+      ><p class="src"
+	><span class="keyword"
 	  >type family</span
 	  > <a href=""
-	  >G</a
+	  >Foo</a
+	  > a :: k</p
+	></div
+      ><div class="top"
+      ><p class="src"
+	><span class="keyword"
+	  >data family</span
+	  > <a href=""
+	  >Bat</a
 	  > a :: *</p
 	></div
       ><div class="top"
@@ -32,7 +72,7 @@ window.onload = function () {pageLoad();};
 	><span class="keyword"
 	  >class</span
 	  > <a href="" target="main"
-	  >A</a
+	  >Assoc</a
 	  > a</p
 	></div
       ><div class="top"
@@ -40,14 +80,24 @@ window.onload = function () {pageLoad();};
 	><span class="keyword"
 	  >type family</span
 	  > <a href=""
-	  >F</a
-	  > a </p
+	  >Bar</a
+	  > b</p
 	></div
       ><div class="top"
       ><p class="src"
-	><a href="" target="main"
-	  >g</a
-	  ></p
+	><span class="keyword"
+	  >type family</span
+	  > a <a href=""
+	  >&lt;&gt;</a
+	  > b :: k</p
+	></div
+      ><div class="top"
+      ><p class="src"
+	><span class="keyword"
+	  >class</span
+	  > a <a href="" target="main"
+	  >&gt;&lt;</a
+	  > b</p
 	></div
       ></div
     ></body
diff --git a/html-test/ref/mini_TypeOperators.html b/html-test/ref/mini_TypeOperators.html
index 02bc918b..ce31643e 100644
--- a/html-test/ref/mini_TypeOperators.html
+++ b/html-test/ref/mini_TypeOperators.html
@@ -19,9 +19,7 @@ window.onload = function () {pageLoad();};
       >TypeOperators</p
       ></div
     ><div id="interface"
-    ><h1
-      >stuff</h1
-      ><div class="top"
+    ><div class="top"
       ><p class="src"
 	><span class="keyword"
 	  >data</span
@@ -55,10 +53,42 @@ window.onload = function () {pageLoad();};
 	></div
       ><div class="top"
       ><p class="src"
+	><span class="keyword"
+	  >class</span
+	  > a <a href="" target="main"
+	  >&lt;=&gt;</a
+	  > b</p
+	></div
+      ><div class="top"
+      ><p class="src"
 	><a href="" target="main"
 	  >biO</a
 	  ></p
 	></div
+      ><div class="top"
+      ><p class="src"
+	><a href="" target="main"
+	  >f</a
+	  ></p
+	></div
+      ><div class="top"
+      ><p class="src"
+	><a href="" target="main"
+	  >g</a
+	  ></p
+	></div
+      ><div class="top"
+      ><p class="src"
+	><a href="" target="main"
+	  >x</a
+	  ></p
+	></div
+      ><div class="top"
+      ><p class="src"
+	><a href="" target="main"
+	  >y</a
+	  ></p
+	></div
       ></div
     ></body
   ></html
diff --git a/html-test/ref/ocean.css b/html-test/ref/ocean.css
index 05597d79..de436324 100644
--- a/html-test/ref/ocean.css
+++ b/html-test/ref/ocean.css
@@ -49,14 +49,14 @@ a[href]:hover { text-decoration:underline; }
    For reasons, see:
       http://yui.yahooapis.com/3.1.1/build/cssfonts/fonts.css
  */
- 
+
 body {
 	font:13px/1.4 sans-serif;
 	*font-size:small; /* for IE */
 	*font:x-small; /* for IE in quirks mode */
 }
 
-h1 { font-size: 146.5%; /* 19pt */ } 
+h1 { font-size: 146.5%; /* 19pt */ }
 h2 { font-size: 131%;   /* 17pt */ }
 h3 { font-size: 116%;   /* 15pt */ }
 h4 { font-size: 100%;   /* 13pt */ }
@@ -98,7 +98,7 @@ pre, code, kbd, samp, tt, .src {
 
 /* @group Common */
 
-.caption, h1, h2, h3, h4, h5, h6 { 
+.caption, h1, h2, h3, h4, h5, h6 {
   font-weight: bold;
   color: rgb(78,98,114);
   margin: 0.8em 0 0.4em;
@@ -122,7 +122,7 @@ ul.links {
 
 ul.links li {
   display: inline;
-  border-left: 1px solid #d5d5d5; 
+  border-left: 1px solid #d5d5d5;
   white-space: nowrap;
   padding: 0;
 }
@@ -378,6 +378,19 @@ div#style-menu-holder {
   margin: 0 -0.5em 0 0.5em;
 }
 
+#interface span.fixity {
+  color: #919191;
+  border-left: 1px solid #919191;
+  padding: 0.2em 0.5em 0.2em 0.5em;
+  margin: 0 -1em 0 1em;
+}
+
+#interface span.rightedge {
+  border-left: 1px solid #919191;
+  padding: 0.2em 0 0.2em 0;
+  margin: 0 0 0 1em;
+}
+
 #interface table { border-spacing: 2px; }
 #interface td {
   vertical-align: top;
@@ -420,19 +433,18 @@ div#style-menu-holder {
   margin: 0;
 }
 
-.subs ul {
+/* Render short-style data instances */
+.inst ul {
   height: 100%;
   padding: 0.5em;
   margin: 0;
 }
 
-.subs ul,
-.subs ul li.src {
+.inst, .inst li {
   list-style: none;
   margin-left: 1em;
 }
 
-
 .top p.src {
   border-top: 1px solid #ccc;
 }
@@ -482,7 +494,7 @@ div#style-menu-holder {
 }
 
 #mini > * {
-  font-size: 93%; /* 12pt */  
+  font-size: 93%; /* 12pt */
 }
 
 #mini #module-list .caption,