Merge branch 'anchors-redux'

80 files changed, 1586 insertions, 645 deletions

diff --git a/html-test/ref/A.html b/html-test/ref/A.html
index 73534dc7..b58845e5 100644
--- a/html-test/ref/A.html
+++ b/html-test/ref/A.html
@@ -89,8 +89,10 @@ window.onload = function () {pageLoad();setSynopsis("mini_A.html");};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:A" class="def"
+	    > <a id="t:A" class="def"
 	    >A</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -98,7 +100,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_A.html&quot;);};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:A" class="def"
+		><a id="v:A" class="def"
 		  >A</a
 		  ></td
 		><td class="doc empty"
@@ -109,18 +111,22 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_A.html&quot;);};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:other" class="def"
+	  ><a id="v:other" class="def"
 	    >other</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:test2" class="def"
+	  ><a id="v:test2" class="def"
 	    >test2</a
 	    > :: <a href="#"
 	    >Bool</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -131,8 +137,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_A.html&quot;);};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:X" class="def"
+	    > <a id="t:X" class="def"
 	    >X</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -144,7 +152,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_A.html&quot;);};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:X" class="def"
+		><a id="v:X" class="def"
 		  >X</a
 		  ></td
 		><td class="doc"
@@ -157,10 +165,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_A.html&quot;);};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:reExport" class="def"
+	  ><a id="v:reExport" class="def"
 	    >reExport</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/B.html b/html-test/ref/B.html
index cc8f9eef..d82cf2cc 100644
--- a/html-test/ref/B.html
+++ b/html-test/ref/B.html
@@ -83,10 +83,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_B.html&quot;);};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:test" class="def"
+	  ><a id="v:test" class="def"
 	    >test</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -121,10 +123,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_B.html&quot;);};
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:reExport" class="def"
+	  ><a id="v:reExport" class="def"
 	    >reExport</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -135,8 +139,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_B.html&quot;);};
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:X" class="def"
+	    > <a id="t:X" class="def"
 	    >X</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -148,7 +154,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_B.html&quot;);};
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:X" class="def"
+		><a id="v:X" class="def"
 		  >X</a
 		  ></td
 		><td class="doc"
diff --git a/html-test/ref/Bold.html b/html-test/ref/Bold.html
index c1f304fd..8325419c 100644
--- a/html-test/ref/Bold.html
+++ b/html-test/ref/Bold.html
@@ -57,9 +57,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bold.html&quot;);
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
-	    > :: a</p
+	    > :: a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Some <strong
diff --git a/html-test/ref/Bug1.html b/html-test/ref/Bug1.html
index ad864e78..4bedbb86 100644
--- a/html-test/ref/Bug1.html
+++ b/html-test/ref/Bug1.html
@@ -63,8 +63,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug1.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:T" class="def"
+	    > <a id="t:T" class="def"
 	    >T</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -81,7 +83,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug1.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:T" class="def"
+		><a id="v:T" class="def"
 		  >T</a
 		  ></td
 		><td class="doc empty"
diff --git a/html-test/ref/Bug195.html b/html-test/ref/Bug195.html
index c81cfbb4..c6af235a 100644
--- a/html-test/ref/Bug195.html
+++ b/html-test/ref/Bug195.html
@@ -49,8 +49,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug195.html&quot;
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:T" class="def"
+	    > <a id="t:T" class="def"
 	    >T</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -58,7 +60,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug195.html&quot;
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:A" class="def"
+		><a id="v:A" class="def"
 		  >A</a
 		  ></td
 		><td class="doc empty"
@@ -72,7 +74,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug195.html&quot;
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:someField" class="def"
+			><a id="v:someField" class="def"
 			  >someField</a
 			  > :: ()</dfn
 			><div class="doc"
@@ -82,7 +84,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug195.html&quot;
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="#" id="v:someOtherField" class="def"
+			><a id="v:someOtherField" class="def"
 			  >someOtherField</a
 			  > :: ()</dfn
 			><div class="doc"
@@ -96,7 +98,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug195.html&quot;
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:B" class="def"
+		><a id="v:B" class="def"
 		  >B</a
 		  ></td
 		><td class="doc empty"
@@ -110,7 +112,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug195.html&quot;
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:someField" class="def"
+			><a id="v:someField" class="def"
 			  >someField</a
 			  > :: ()</dfn
 			><div class="doc"
@@ -120,7 +122,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug195.html&quot;
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="#" id="v:someOtherField" class="def"
+			><a id="v:someOtherField" class="def"
 			  >someOtherField</a
 			  > :: ()</dfn
 			><div class="doc"
@@ -134,7 +136,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug195.html&quot;
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:C" class="def"
+		><a id="v:C" class="def"
 		  >C</a
 		  ></td
 		><td class="doc empty"
@@ -148,7 +150,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug195.html&quot;
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:someField" class="def"
+			><a id="v:someField" class="def"
 			  >someField</a
 			  > :: ()</dfn
 			><div class="doc"
@@ -158,7 +160,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug195.html&quot;
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="#" id="v:someOtherField" class="def"
+			><a id="v:someOtherField" class="def"
 			  >someOtherField</a
 			  > :: ()</dfn
 			><div class="doc"
diff --git a/html-test/ref/Bug2.html b/html-test/ref/Bug2.html
index 1b7f50ff..9ae26bcd 100644
--- a/html-test/ref/Bug2.html
+++ b/html-test/ref/Bug2.html
@@ -47,10 +47,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug2.html&quot;);
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:x" class="def"
+	  ><a id="v:x" class="def"
 	    >x</a
 	    > :: <a href="#"
 	    >A</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	></div
diff --git a/html-test/ref/Bug201.html b/html-test/ref/Bug201.html
index 06d8ec96..c84b55b1 100644
--- a/html-test/ref/Bug201.html
+++ b/html-test/ref/Bug201.html
@@ -61,9 +61,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug201.html&quot;
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f" class="def"
+	  ><a id="v:f" class="def"
 	    >f</a
-	    > :: ()</p
+	    > :: () <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><pre
 	    >This leading whitespace
@@ -73,9 +75,11 @@ should be dropped
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:g" class="def"
+	  ><a id="v:g" class="def"
 	    >g</a
-	    > :: ()</p
+	    > :: () <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><pre
 	    > But this one
diff --git a/html-test/ref/Bug253.html b/html-test/ref/Bug253.html
index 2d78880b..36640332 100644
--- a/html-test/ref/Bug253.html
+++ b/html-test/ref/Bug253.html
@@ -73,9 +73,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug253.html&quot;
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
-	    > :: ()</p
+	    > :: () <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >This link should generate <code
diff --git a/html-test/ref/Bug26.html b/html-test/ref/Bug26.html
index 6537e30b..16251c0b 100644
--- a/html-test/ref/Bug26.html
+++ b/html-test/ref/Bug26.html
@@ -83,9 +83,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug26.html&quot;)
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f" class="def"
+	  ><a id="v:f" class="def"
 	    >f</a
-	    > :: ()</p
+	    > :: () <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Foo</p
@@ -97,9 +99,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug26.html&quot;)
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:g" class="def"
+	  ><a id="v:g" class="def"
 	    >g</a
-	    > :: ()</p
+	    > :: () <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Bar</p
@@ -109,10 +113,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug26.html&quot;)
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:C" class="def"
+	    > <a id="t:C" class="def"
 	    >C</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -134,9 +140,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug26.html&quot;)
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:c_f" class="def"
+	    ><a id="v:c_f" class="def"
 	      >c_f</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><div class="doc"
 	    ><p
 	      ><em
@@ -157,6 +165,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug26.html&quot;)
 		      > <a href="#"
 		      >C</a
 		      > ()</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -176,7 +186,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug26.html&quot;)
 			><p class="src"
 			><a href="#"
 			  >c_f</a
-			  > :: ()</p
+			  > :: () <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
diff --git a/html-test/ref/Bug294.html b/html-test/ref/Bug294.html
index 8c0f2837..c5f62da9 100644
--- a/html-test/ref/Bug294.html
+++ b/html-test/ref/Bug294.html
@@ -49,8 +49,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug294.html&quot;
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:A" class="def"
+	    > <a id="t:A" class="def"
 	    >A</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs instances"
 	  ><p id="control.i:A" class="caption collapser" onclick="toggleSection('i:A')"
@@ -66,11 +68,13 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug294.html&quot;
 		      >DP</a
 		      > <a href="#"
 		      >A</a
-		      > = <a href="#" id="v:ProblemCtor-39-" class="def"
+		      > = <a id="v:ProblemCtor-39-" class="def"
 		      >ProblemCtor'</a
 		      > <a href="#"
 		      >A</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -82,11 +86,13 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug294.html&quot;
 		      >data</span
 		      > TP <a href="#"
 		      >A</a
-		      > = <a href="#" id="v:ProblemCtor" class="def"
+		      > = <a id="v:ProblemCtor" class="def"
 		      >ProblemCtor</a
 		      > <a href="#"
 		      >A</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -97,42 +103,50 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug294.html&quot;
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:problemField" class="def"
+	  ><a id="v:problemField" class="def"
 	    >problemField</a
 	    > :: TO <a href="#"
 	    >A</a
 	    > -&gt; <a href="#"
 	    >A</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:problemField-39-" class="def"
+	  ><a id="v:problemField-39-" class="def"
 	    >problemField'</a
 	    > :: DO <a href="#"
 	    >A</a
 	    > -&gt; <a href="#"
 	    >A</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:gadtField" class="def"
+	  ><a id="v:gadtField" class="def"
 	    >gadtField</a
 	    > :: ({..} -&gt; GADT <a href="#"
 	    >A</a
 	    >) -&gt; <a href="#"
 	    >A</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a href="#" id="t:DP" class="def"
+	    > <a id="t:DP" class="def"
 	    >DP</a
 	    > t :: <a href="#"
 	    >*</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs instances"
 	  ><p id="control.i:DP" class="caption collapser" onclick="toggleSection('i:DP')"
@@ -148,11 +162,13 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug294.html&quot;
 		      >DP</a
 		      > <a href="#"
 		      >A</a
-		      > = <a href="#" id="v:ProblemCtor-39-" class="def"
+		      > = <a id="v:ProblemCtor-39-" class="def"
 		      >ProblemCtor'</a
 		      > <a href="#"
 		      >A</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
diff --git a/html-test/ref/Bug298.html b/html-test/ref/Bug298.html
index 6ce24bdb..6204819e 100644
--- a/html-test/ref/Bug298.html
+++ b/html-test/ref/Bug298.html
@@ -73,33 +73,43 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug298.html&quot;
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:-60--94--62-" class="def"
+	  ><a id="v:-60--94--62-" class="def"
 	    >(&lt;^&gt;)</a
-	    > :: (a -&gt; a) -&gt; a -&gt; a</p
+	    > :: (a -&gt; a) -&gt; a -&gt; a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:-60--94-" class="def"
+	  ><a id="v:-60--94-" class="def"
 	    >(&lt;^)</a
-	    > :: a -&gt; a -&gt; a</p
+	    > :: a -&gt; a -&gt; a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:-94--62-" class="def"
+	  ><a id="v:-94--62-" class="def"
 	    >(^&gt;)</a
-	    > :: a -&gt; a -&gt; a</p
+	    > :: a -&gt; a -&gt; a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:-8902--94-" class="def"
+	  ><a id="v:-8902--94-" class="def"
 	    >(&#8902;^)</a
-	    > :: a -&gt; a -&gt; a</p
+	    > :: a -&gt; a -&gt; a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f" class="def"
+	  ><a id="v:f" class="def"
 	    >f</a
-	    > :: ()</p
+	    > :: () <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Links to <code
diff --git a/html-test/ref/Bug3.html b/html-test/ref/Bug3.html
index d5287df4..eaa16f97 100644
--- a/html-test/ref/Bug3.html
+++ b/html-test/ref/Bug3.html
@@ -59,10 +59,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug3.html&quot;);
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/Bug308.html b/html-test/ref/Bug308.html
index 6113fdeb..915aec4c 100644
--- a/html-test/ref/Bug308.html
+++ b/html-test/ref/Bug308.html
@@ -61,25 +61,29 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug308.html&quot;
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f" class="def"
+	  ><a id="v:f" class="def"
 	    >f</a
-	    > :: ()</p
+	    > :: () <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
-	    >start<a name="startAnchor"
+	    >start<a id="startAnchor"
 	      ></a
-	      > followed by middle<a name="middleAnchor"
+	      > followed by middle<a id="middleAnchor"
 	      ></a
-	      > and end<a name="endAnchor"
+	      > and end<a id="endAnchor"
 	      ></a
 	      ></p
 	    ></div
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:g" class="def"
+	  ><a id="v:g" class="def"
 	    >g</a
-	    > :: ()</p
+	    > :: () <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >start <a href="#"
diff --git a/html-test/ref/Bug308CrossModule.html b/html-test/ref/Bug308CrossModule.html
index cf935c85..b2ae2adf 100644
--- a/html-test/ref/Bug308CrossModule.html
+++ b/html-test/ref/Bug308CrossModule.html
@@ -57,9 +57,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug308CrossModule
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:h" class="def"
+	  ><a id="v:h" class="def"
 	    >h</a
-	    > :: ()</p
+	    > :: () <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >start <a href="#"
diff --git a/html-test/ref/Bug310.html b/html-test/ref/Bug310.html
index 7ba62e68..894e136f 100644
--- a/html-test/ref/Bug310.html
+++ b/html-test/ref/Bug310.html
@@ -63,7 +63,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug310.html&quot;
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > a <a href="#" id="t:-43-" class="def"
+	    > a <a id="t:-43-" class="def"
 	    >+</a
 	    > b :: <a href="#"
 	    >Nat</a
@@ -71,6 +71,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug310.html&quot;
 	    >infixl 6</span
 	    ><span class="rightedge"
 	    ></span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/Bug313.html b/html-test/ref/Bug313.html
index b2857202..131b3382 100644
--- a/html-test/ref/Bug313.html
+++ b/html-test/ref/Bug313.html
@@ -74,9 +74,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug313.html&quot;
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:a" class="def"
+	  ><a id="v:a" class="def"
 	    >a</a
-	    > :: a</p
+	    > :: a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Some text.</p
@@ -98,9 +100,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug313.html&quot;
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:b" class="def"
+	  ><a id="v:b" class="def"
 	    >b</a
-	    > :: a</p
+	    > :: a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Some text.</p
diff --git a/html-test/ref/Bug335.html b/html-test/ref/Bug335.html
index c8f5bed9..ea760d41 100644
--- a/html-test/ref/Bug335.html
+++ b/html-test/ref/Bug335.html
@@ -61,9 +61,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug335.html&quot;
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f" class="def"
+	  ><a id="v:f" class="def"
 	    >f</a
-	    > :: ()</p
+	    > :: () <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><h3 id="control.ch:f0" class="caption expander" onclick="toggleSection('ch:f0')"
 	    >ExF:</h3
@@ -75,9 +77,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug335.html&quot;
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:g" class="def"
+	  ><a id="v:g" class="def"
 	    >g</a
-	    > :: ()</p
+	    > :: () <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><h3 id="control.ch:g0" class="caption expander" onclick="toggleSection('ch:g0')"
 	    >ExG:</h3
diff --git a/html-test/ref/Bug387.html b/html-test/ref/Bug387.html
index 0fdfd723..25d6d989 100644
--- a/html-test/ref/Bug387.html
+++ b/html-test/ref/Bug387.html
@@ -76,27 +76,31 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug387.html&quot;
 	></div
       ><div id="interface"
       ><h1 id="g:1"
-	>Section1<a name="a:section1"
+	>Section1<a id="a:section1"
 	  ></a
 	  ></h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:test1" class="def"
+	  ><a id="v:test1" class="def"
 	    >test1</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	><h1 id="g:2"
-	>Section2<a name="a:section2"
+	>Section2<a id="a:section2"
 	  ></a
 	  ></h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:test2" class="def"
+	  ><a id="v:test2" class="def"
 	    >test2</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	></div
diff --git a/html-test/ref/Bug4.html b/html-test/ref/Bug4.html
index d109a20b..22792fc1 100644
--- a/html-test/ref/Bug4.html
+++ b/html-test/ref/Bug4.html
@@ -59,10 +59,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug4.html&quot;);
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/Bug6.html b/html-test/ref/Bug6.html
index 335a16d0..27e5251d 100644
--- a/html-test/ref/Bug6.html
+++ b/html-test/ref/Bug6.html
@@ -133,8 +133,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug6.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:A" class="def"
+	    > <a id="t:A" class="def"
 	    >A</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -146,7 +148,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug6.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:A" class="def"
+		><a id="v:A" class="def"
 		  >A</a
 		  > <a href="#"
 		  >Int</a
@@ -161,8 +163,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug6.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:B" class="def"
+	    > <a id="t:B" class="def"
 	    >B</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -175,7 +179,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug6.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:B" class="def"
+		><a id="v:B" class="def"
 		  >B</a
 		  ></td
 		><td class="doc empty"
@@ -189,7 +193,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug6.html&quot;);
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:b" class="def"
+			><a id="v:b" class="def"
 			  >b</a
 			  > :: <a href="#"
 			  >Int</a
@@ -208,8 +212,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug6.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:C" class="def"
+	    > <a id="t:C" class="def"
 	    >C</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -221,7 +227,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug6.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:C" class="def"
+		><a id="v:C" class="def"
 		  >C</a
 		  ></td
 		><td class="doc empty"
@@ -235,7 +241,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug6.html&quot;);
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:c1" class="def"
+			><a id="v:c1" class="def"
 			  >c1</a
 			  > :: <a href="#"
 			  >Int</a
@@ -245,7 +251,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug6.html&quot;);
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="#" id="v:c2" class="def"
+			><a id="v:c2" class="def"
 			  >c2</a
 			  > :: <a href="#"
 			  >Int</a
@@ -264,8 +270,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug6.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:D" class="def"
+	    > <a id="t:D" class="def"
 	    >D</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -278,7 +286,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug6.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:D" class="def"
+		><a id="v:D" class="def"
 		  >D</a
 		  > <a href="#"
 		  >Int</a
@@ -295,8 +303,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug6.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="#" id="t:E" class="def"
+	    > <a id="t:E" class="def"
 	    >E</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -308,7 +318,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug6.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:E" class="def"
+		><a id="v:E" class="def"
 		  >E</a
 		  > <a href="#"
 		  >Int</a
diff --git a/html-test/ref/Bug7.html b/html-test/ref/Bug7.html
index 4578c771..fe9e4569 100644
--- a/html-test/ref/Bug7.html
+++ b/html-test/ref/Bug7.html
@@ -78,8 +78,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug7.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Foo" class="def"
+	    > <a id="t:Foo" class="def"
 	    >Foo</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -91,7 +93,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug7.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:Foo" class="def"
+		><a id="v:Foo" class="def"
 		  >Foo</a
 		  ></td
 		><td class="doc empty"
@@ -116,6 +118,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug7.html&quot;);
 		      > <a href="#"
 		      >Foo</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -136,9 +140,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug7.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:Bar" class="def"
+	    > <a id="t:Bar" class="def"
 	    >Bar</a
-	    > x y</p
+	    > x y <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >The Bar class</p
@@ -160,6 +166,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug7.html&quot;);
 		      > <a href="#"
 		      >Foo</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html
index 3b91dfc7..d32e0dbb 100644
--- a/html-test/ref/Bug8.html
+++ b/html-test/ref/Bug8.html
@@ -49,8 +49,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug8.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Typ" class="def"
+	    > <a id="t:Typ" class="def"
 	    >Typ</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -58,7 +60,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug8.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:Type" class="def"
+		><a id="v:Type" class="def"
 		  >Type</a
 		  > (<a href="#"
 		  >Typ</a
@@ -70,7 +72,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug8.html&quot;);
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:TFree" class="def"
+		><a id="v:TFree" class="def"
 		  >TFree</a
 		  > (<a href="#"
 		  >Typ</a
@@ -85,7 +87,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug8.html&quot;);
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:-45--45--62-" class="def"
+	  ><a id="v:-45--45--62-" class="def"
 	    >(--&gt;)</a
 	    > :: t -&gt; t1 -&gt; <a href="#"
 	    >Typ</a
@@ -93,11 +95,13 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug8.html&quot;);
 	    >infix 9</span
 	    ><span class="rightedge"
 	    ></span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:-45--45--45--62-" class="def"
+	  ><a id="v:-45--45--45--62-" class="def"
 	    >(---&gt;)</a
 	    > :: <a href="#"
 	    >Foldable</a
@@ -109,25 +113,33 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug8.html&quot;);
 	    >infix 9</span
 	    ><span class="rightedge"
 	    ></span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:s" class="def"
+	  ><a id="v:s" class="def"
 	    >s</a
-	    > :: a</p
+	    > :: a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:t" class="def"
+	  ><a id="v:t" class="def"
 	    >t</a
-	    > :: a</p
+	    > :: a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:main" class="def"
+	  ><a id="v:main" class="def"
 	    >main</a
-	    > :: a</p
+	    > :: a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	></div
       ></div
diff --git a/html-test/ref/Bug85.html b/html-test/ref/Bug85.html
index 4e52ad65..90042380 100644
--- a/html-test/ref/Bug85.html
+++ b/html-test/ref/Bug85.html
@@ -49,7 +49,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug85.html&quot;)
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Foo" class="def"
+	    > <a id="t:Foo" class="def"
 	    >Foo</a
 	    > :: (<a href="#"
 	    >*</a
@@ -61,6 +61,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug85.html&quot;)
 	    >*</a
 	    > <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -68,7 +70,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug85.html&quot;)
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:Bar" class="def"
+		><a id="v:Bar" class="def"
 		  >Bar</a
 		  > :: f x -&gt; <a href="#"
 		  >Foo</a
@@ -83,12 +85,14 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug85.html&quot;)
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Baz" class="def"
+	    > <a id="t:Baz" class="def"
 	    >Baz</a
 	    > :: <a href="#"
 	    >*</a
 	    > <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -96,7 +100,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug85.html&quot;)
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:Baz-39-" class="def"
+		><a id="v:Baz-39-" class="def"
 		  >Baz'</a
 		  > :: <a href="#"
 		  >Baz</a
@@ -111,10 +115,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug85.html&quot;)
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Qux" class="def"
+	    > <a id="t:Qux" class="def"
 	    >Qux</a
 	    > <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -122,7 +128,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bug85.html&quot;)
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:Quux" class="def"
+		><a id="v:Quux" class="def"
 		  >Quux</a
 		  > :: <a href="#"
 		  >Qux</a
diff --git a/html-test/ref/BugDeprecated.html b/html-test/ref/BugDeprecated.html
index 38f8e00e..a6da413e 100644
--- a/html-test/ref/BugDeprecated.html
+++ b/html-test/ref/BugDeprecated.html
@@ -89,10 +89,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_BugDeprecated.htm
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -103,10 +105,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_BugDeprecated.htm
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:bar" class="def"
+	  ><a id="v:bar" class="def"
 	    >bar</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -117,10 +121,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_BugDeprecated.htm
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:baz" class="def"
+	  ><a id="v:baz" class="def"
 	    >baz</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -131,10 +137,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_BugDeprecated.htm
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:one" class="def"
+	  ><a id="v:one" class="def"
 	    >one</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -147,10 +155,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_BugDeprecated.htm
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:two" class="def"
+	  ><a id="v:two" class="def"
 	    >two</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -161,10 +171,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_BugDeprecated.htm
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:three" class="def"
+	  ><a id="v:three" class="def"
 	    >three</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
diff --git a/html-test/ref/BugExportHeadings.html b/html-test/ref/BugExportHeadings.html
index 970f8200..e8fd6fa6 100644
--- a/html-test/ref/BugExportHeadings.html
+++ b/html-test/ref/BugExportHeadings.html
@@ -119,40 +119,48 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_BugExportHeadings
 	>Foo</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	><h1 id="g:2"
 	>Bar</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:bar" class="def"
+	  ><a id="v:bar" class="def"
 	    >bar</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	><h1 id="g:3"
 	>Baz</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:baz" class="def"
+	  ><a id="v:baz" class="def"
 	    >baz</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	><h1 id="g:4"
 	>One</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:one" class="def"
+	  ><a id="v:one" class="def"
 	    >one</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -165,10 +173,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_BugExportHeadings
 	>Two</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:two" class="def"
+	  ><a id="v:two" class="def"
 	    >two</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -181,10 +191,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_BugExportHeadings
 	>Three</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:three" class="def"
+	  ><a id="v:three" class="def"
 	    >three</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
diff --git a/html-test/ref/Bugs.html b/html-test/ref/Bugs.html
index 6082a9b8..cf87d82f 100644
--- a/html-test/ref/Bugs.html
+++ b/html-test/ref/Bugs.html
@@ -49,16 +49,18 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Bugs.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:A" class="def"
+	    > <a id="t:A" class="def"
 	    >A</a
-	    > a</p
+	    > a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
 	    >Constructors</p
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:A" class="def"
+		><a id="v:A" class="def"
 		  >A</a
 		  > a (a -&gt; <a href="#"
 		  >Int</a
diff --git a/html-test/ref/DeprecatedClass.html b/html-test/ref/DeprecatedClass.html
index 0c7449dc..43e1a255 100644
--- a/html-test/ref/DeprecatedClass.html
+++ b/html-test/ref/DeprecatedClass.html
@@ -75,10 +75,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedClass.h
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:SomeClass" class="def"
+	    > <a id="t:SomeClass" class="def"
 	    >SomeClass</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -100,9 +102,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedClass.h
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:foo" class="def"
+	    ><a id="v:foo" class="def"
 	      >foo</a
-	      > :: a -&gt; a</p
+	      > :: a -&gt; a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><div class="doc"
 	    ><div class="warning"
 	      ><p
@@ -117,10 +121,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedClass.h
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:SomeOtherClass" class="def"
+	    > <a id="t:SomeOtherClass" class="def"
 	    >SomeOtherClass</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -140,9 +146,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedClass.h
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:bar" class="def"
+	    ><a id="v:bar" class="def"
 	      >bar</a
-	      > :: a -&gt; a</p
+	      > :: a -&gt; a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><div class="doc"
 	    ><div class="warning"
 	      ><p
diff --git a/html-test/ref/DeprecatedData.html b/html-test/ref/DeprecatedData.html
index 2029bb89..2e53f3ea 100644
--- a/html-test/ref/DeprecatedData.html
+++ b/html-test/ref/DeprecatedData.html
@@ -87,8 +87,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedData.ht
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Foo" class="def"
+	    > <a id="t:Foo" class="def"
 	    >Foo</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -104,7 +106,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedData.ht
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:Foo" class="def"
+		><a id="v:Foo" class="def"
 		  >Foo</a
 		  ></td
 		><td class="doc"
@@ -118,7 +120,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedData.ht
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:Bar" class="def"
+		><a id="v:Bar" class="def"
 		  >Bar</a
 		  ></td
 		><td class="doc"
@@ -137,8 +139,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedData.ht
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:One" class="def"
+	    > <a id="t:One" class="def"
 	    >One</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -152,7 +156,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedData.ht
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:One" class="def"
+		><a id="v:One" class="def"
 		  >One</a
 		  ></td
 		><td class="doc"
@@ -164,7 +168,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedData.ht
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:Two" class="def"
+		><a id="v:Two" class="def"
 		  >Two</a
 		  ></td
 		><td class="doc"
diff --git a/html-test/ref/DeprecatedFunction.html b/html-test/ref/DeprecatedFunction.html
index e3ecec8d..8ac2218a 100644
--- a/html-test/ref/DeprecatedFunction.html
+++ b/html-test/ref/DeprecatedFunction.html
@@ -65,10 +65,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedFunctio
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -85,10 +87,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedFunctio
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:bar" class="def"
+	  ><a id="v:bar" class="def"
 	    >bar</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/DeprecatedFunction2.html b/html-test/ref/DeprecatedFunction2.html
index 10676eef..545e3d72 100644
--- a/html-test/ref/DeprecatedFunction2.html
+++ b/html-test/ref/DeprecatedFunction2.html
@@ -59,10 +59,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedFunctio
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
diff --git a/html-test/ref/DeprecatedFunction3.html b/html-test/ref/DeprecatedFunction3.html
index c5dbf8ee..fc20977e 100644
--- a/html-test/ref/DeprecatedFunction3.html
+++ b/html-test/ref/DeprecatedFunction3.html
@@ -59,10 +59,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedFunctio
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href="#"
 	    >Integer</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
diff --git a/html-test/ref/DeprecatedModule.html b/html-test/ref/DeprecatedModule.html
index 4a38a820..0811319d 100644
--- a/html-test/ref/DeprecatedModule.html
+++ b/html-test/ref/DeprecatedModule.html
@@ -63,10 +63,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedModule.
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	></div
diff --git a/html-test/ref/DeprecatedModule2.html b/html-test/ref/DeprecatedModule2.html
index b32e079e..db453568 100644
--- a/html-test/ref/DeprecatedModule2.html
+++ b/html-test/ref/DeprecatedModule2.html
@@ -57,10 +57,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedModule2
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	></div
diff --git a/html-test/ref/DeprecatedNewtype.html b/html-test/ref/DeprecatedNewtype.html
index 084c95b1..3af56b1b 100644
--- a/html-test/ref/DeprecatedNewtype.html
+++ b/html-test/ref/DeprecatedNewtype.html
@@ -75,8 +75,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedNewtype
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="#" id="t:SomeNewType" class="def"
+	    > <a id="t:SomeNewType" class="def"
 	    >SomeNewType</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -92,7 +94,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedNewtype
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:SomeNewTypeConst" class="def"
+		><a id="v:SomeNewTypeConst" class="def"
 		  >SomeNewTypeConst</a
 		  > <a href="#"
 		  >String</a
@@ -113,8 +115,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedNewtype
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="#" id="t:SomeOtherNewType" class="def"
+	    > <a id="t:SomeOtherNewType" class="def"
 	    >SomeOtherNewType</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -128,7 +132,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedNewtype
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:SomeOtherNewTypeConst" class="def"
+		><a id="v:SomeOtherNewTypeConst" class="def"
 		  >SomeOtherNewTypeConst</a
 		  > <a href="#"
 		  >String</a
diff --git a/html-test/ref/DeprecatedReExport.html b/html-test/ref/DeprecatedReExport.html
index 4279ef80..595ae4ca 100644
--- a/html-test/ref/DeprecatedReExport.html
+++ b/html-test/ref/DeprecatedReExport.html
@@ -85,10 +85,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedReExpor
 	>Re-exported from an other module</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
diff --git a/html-test/ref/DeprecatedRecord.html b/html-test/ref/DeprecatedRecord.html
index c2fb2e0d..82da6d30 100644
--- a/html-test/ref/DeprecatedRecord.html
+++ b/html-test/ref/DeprecatedRecord.html
@@ -77,8 +77,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedRecord.
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Foo" class="def"
+	    > <a id="t:Foo" class="def"
 	    >Foo</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -90,7 +92,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedRecord.
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:Foo" class="def"
+		><a id="v:Foo" class="def"
 		  >Foo</a
 		  ></td
 		><td class="doc empty"
@@ -104,7 +106,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedRecord.
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:fooName" class="def"
+			><a id="v:fooName" class="def"
 			  >fooName</a
 			  > :: <a href="#"
 			  >String</a
@@ -116,7 +118,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedRecord.
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="#" id="v:fooValue" class="def"
+			><a id="v:fooValue" class="def"
 			  >fooValue</a
 			  > :: <a href="#"
 			  >Int</a
diff --git a/html-test/ref/DeprecatedTypeFamily.html b/html-test/ref/DeprecatedTypeFamily.html
index 5539aadb..c31eae53 100644
--- a/html-test/ref/DeprecatedTypeFamily.html
+++ b/html-test/ref/DeprecatedTypeFamily.html
@@ -75,12 +75,14 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedTypeFam
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a href="#" id="t:SomeTypeFamily" class="def"
+	    > <a id="t:SomeTypeFamily" class="def"
 	    >SomeTypeFamily</a
 	    > k :: <a href="#"
 	    >*</a
 	    > -&gt; <a href="#"
 	    >*</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -95,12 +97,14 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedTypeFam
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a href="#" id="t:SomeOtherTypeFamily" class="def"
+	    > <a id="t:SomeOtherTypeFamily" class="def"
 	    >SomeOtherTypeFamily</a
 	    > k :: <a href="#"
 	    >*</a
 	    > -&gt; <a href="#"
 	    >*</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
diff --git a/html-test/ref/DeprecatedTypeSynonym.html b/html-test/ref/DeprecatedTypeSynonym.html
index 925f4656..df0050ed 100644
--- a/html-test/ref/DeprecatedTypeSynonym.html
+++ b/html-test/ref/DeprecatedTypeSynonym.html
@@ -71,10 +71,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedTypeSyn
 	><p class="src"
 	  ><span class="keyword"
 	    >type</span
-	    > <a href="#" id="t:TypeSyn" class="def"
+	    > <a id="t:TypeSyn" class="def"
 	    >TypeSyn</a
 	    > = <a href="#"
 	    >String</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
@@ -89,10 +91,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_DeprecatedTypeSyn
 	><p class="src"
 	  ><span class="keyword"
 	    >type</span
-	    > <a href="#" id="t:OtherTypeSyn" class="def"
+	    > <a id="t:OtherTypeSyn" class="def"
 	    >OtherTypeSyn</a
 	    > = <a href="#"
 	    >String</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><div class="warning"
diff --git a/html-test/ref/Examples.html b/html-test/ref/Examples.html
index a8565ae6..e885928b 100644
--- a/html-test/ref/Examples.html
+++ b/html-test/ref/Examples.html
@@ -61,12 +61,14 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Examples.html&quo
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:fib" class="def"
+	  ><a id="v:fib" class="def"
 	    >fib</a
 	    > :: <a href="#"
 	    >Integer</a
 	    > -&gt; <a href="#"
 	    >Integer</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/Extensions.html b/html-test/ref/Extensions.html
index 66b77c04..554bab12 100644
--- a/html-test/ref/Extensions.html
+++ b/html-test/ref/Extensions.html
@@ -69,9 +69,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Extensions.html&q
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foobar" class="def"
+	  ><a id="v:foobar" class="def"
 	    >foobar</a
-	    > :: t</p
+	    > :: t <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Bar</p
diff --git a/html-test/ref/FunArgs.html b/html-test/ref/FunArgs.html
index 30273c0b..d1ee154a 100644
--- a/html-test/ref/FunArgs.html
+++ b/html-test/ref/FunArgs.html
@@ -47,8 +47,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_FunArgs.html&quot
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f" class="def"
+	  ><a id="v:f" class="def"
 	    >f</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs arguments"
 	  ><p class="caption"
@@ -111,8 +113,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_FunArgs.html&quot
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:g" class="def"
+	  ><a id="v:g" class="def"
 	    >g</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs arguments"
 	  ><p class="caption"
@@ -155,8 +159,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_FunArgs.html&quot
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:h" class="def"
+	  ><a id="v:h" class="def"
 	    >h</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs arguments"
 	  ><p class="caption"
@@ -199,8 +205,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_FunArgs.html&quot
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:i" class="def"
+	  ><a id="v:i" class="def"
 	    >i</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs arguments"
 	  ><p class="caption"
@@ -237,8 +245,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_FunArgs.html&quot
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:j" class="def"
+	  ><a id="v:j" class="def"
 	    >j</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs arguments"
 	  ><p class="caption"
diff --git a/html-test/ref/GADTRecords.html b/html-test/ref/GADTRecords.html
index 8ee4b332..7cec535c 100644
--- a/html-test/ref/GADTRecords.html
+++ b/html-test/ref/GADTRecords.html
@@ -97,10 +97,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_GADTRecords.html&
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:H1" class="def"
+	    > <a id="t:H1" class="def"
 	    >H1</a
 	    > a b <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -112,7 +114,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_GADTRecords.html&
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:C1" class="def"
+		><a id="v:C1" class="def"
 		  >C1</a
 		  > :: <a href="#"
 		  >H1</a
@@ -122,7 +124,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_GADTRecords.html&
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:C2" class="def"
+		><a id="v:C2" class="def"
 		  >C2</a
 		  > :: <a href="#"
 		  >Ord</a
@@ -134,7 +136,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_GADTRecords.html&
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:C3" class="def"
+		><a id="v:C3" class="def"
 		  >C3</a
 		  > :: {..} -&gt; <a href="#"
 		  >H1</a
@@ -154,7 +156,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_GADTRecords.html&
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:field" class="def"
+			><a id="v:field" class="def"
 			  >field</a
 			  > :: <a href="#"
 			  >Int</a
@@ -170,7 +172,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_GADTRecords.html&
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:C4" class="def"
+		><a id="v:C4" class="def"
 		  >C4</a
 		  > :: {..} -&gt; <a href="#"
 		  >H1</a
@@ -188,7 +190,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_GADTRecords.html&
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:field2" class="def"
+			><a id="v:field2" class="def"
 			  >field2</a
 			  > :: a</dfn
 			><div class="doc"
diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html
index f4e2d9ee..85c61f62 100644
--- a/html-test/ref/Hash.html
+++ b/html-test/ref/Hash.html
@@ -142,9 +142,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:HashTable" class="def"
+	    > <a id="t:HashTable" class="def"
 	    >HashTable</a
-	    > key val</p
+	    > key val <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >A hash table with keys of type <code
@@ -167,7 +169,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);
 	  >s</h2
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:new" class="def"
+	  ><a id="v:new" class="def"
 	    >new</a
 	    > :: (<a href="#"
 	    >Eq</a
@@ -179,7 +181,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);
 	    >IO</a
 	    > (<a href="#"
 	    >HashTable</a
-	    > key val)</p
+	    > key val) <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Builds a new hash table with a given size</p
@@ -187,7 +191,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:insert" class="def"
+	  ><a id="v:insert" class="def"
 	    >insert</a
 	    > :: (<a href="#"
 	    >Eq</a
@@ -195,7 +199,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);
 	    >Hash</a
 	    > key) =&gt; key -&gt; val -&gt; <a href="#"
 	    >IO</a
-	    > ()</p
+	    > () <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Inserts a new element into the hash table</p
@@ -203,7 +209,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:lookup" class="def"
+	  ><a id="v:lookup" class="def"
 	    >lookup</a
 	    > :: <a href="#"
 	    >Hash</a
@@ -211,7 +217,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);
 	    >IO</a
 	    > (<a href="#"
 	    >Maybe</a
-	    > val)</p
+	    > val) <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Looks up a key in the hash table, returns <code
@@ -236,10 +244,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:Hash" class="def"
+	    > <a id="t:Hash" class="def"
 	    >Hash</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -257,10 +267,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:hash" class="def"
+	    ><a id="v:hash" class="def"
 	      >hash</a
 	      > :: a -&gt; <a href="#"
 	      >Int</a
+	      > <a href="#" class="selflink"
+	      >#</a
 	      ></p
 	    ><div class="doc"
 	    ><p
@@ -288,6 +300,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);
 		      > <a href="#"
 		      >Float</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -305,6 +319,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);
 			  >Float</a
 			  > -&gt; <a href="#"
 			  >Int</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			></div
 		      ></div
@@ -320,6 +336,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);
 		      > <a href="#"
 		      >Int</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -337,6 +355,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);
 			  >Int</a
 			  > -&gt; <a href="#"
 			  >Int</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			></div
 		      ></div
@@ -354,6 +374,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);
 		      > b) =&gt; <a href="#"
 		      >Hash</a
 		      > (a, b)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -369,6 +391,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hash.html&quot;);
 			  >hash</a
 			  > :: (a, b) -&gt; <a href="#"
 			  >Int</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			></div
 		      ></div
diff --git a/html-test/ref/HiddenInstances.html b/html-test/ref/HiddenInstances.html
index d18c6b6c..90cb1c3b 100644
--- a/html-test/ref/HiddenInstances.html
+++ b/html-test/ref/HiddenInstances.html
@@ -67,9 +67,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstances.h
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:VisibleClass" class="def"
+	    > <a id="t:VisibleClass" class="def"
 	    >VisibleClass</a
-	    > a</p
+	    > a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Should be visible</p
@@ -89,6 +91,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstances.h
 		      > <a href="#"
 		      >Int</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -111,6 +115,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstances.h
 		      > <a href="#"
 		      >VisibleData</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -131,8 +137,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstances.h
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:VisibleData" class="def"
+	    > <a id="t:VisibleData" class="def"
 	    >VisibleData</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -153,6 +161,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstances.h
 		      > <a href="#"
 		      >VisibleData</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -174,6 +184,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstances.h
 			  >VisibleData</a
 			  > -&gt; <a href="#"
 			  >VisibleData</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -184,6 +196,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstances.h
 			  >VisibleData</a
 			  > -&gt; <a href="#"
 			  >VisibleData</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -194,6 +208,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstances.h
 			  >VisibleData</a
 			  > -&gt; <a href="#"
 			  >VisibleData</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -202,6 +218,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstances.h
 			  >VisibleData</a
 			  > -&gt; <a href="#"
 			  >VisibleData</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -210,6 +228,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstances.h
 			  >VisibleData</a
 			  > -&gt; <a href="#"
 			  >VisibleData</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -218,6 +238,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstances.h
 			  >VisibleData</a
 			  > -&gt; <a href="#"
 			  >VisibleData</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -226,6 +248,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstances.h
 			  >Integer</a
 			  > -&gt; <a href="#"
 			  >VisibleData</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			></div
 		      ></div
@@ -241,6 +265,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstances.h
 		      > <a href="#"
 		      >VisibleData</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
diff --git a/html-test/ref/HiddenInstancesB.html b/html-test/ref/HiddenInstancesB.html
index 17f1d03f..fc8824fa 100644
--- a/html-test/ref/HiddenInstancesB.html
+++ b/html-test/ref/HiddenInstancesB.html
@@ -67,9 +67,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstancesB.
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:Foo" class="def"
+	    > <a id="t:Foo" class="def"
 	    >Foo</a
-	    > a</p
+	    > a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Should be visible</p
@@ -89,6 +91,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstancesB.
 		      > <a href="#"
 		      >Bar</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -109,8 +113,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstancesB.
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Bar" class="def"
+	    > <a id="t:Bar" class="def"
 	    >Bar</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -131,6 +137,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_HiddenInstancesB.
 		      > <a href="#"
 		      >Bar</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
diff --git a/html-test/ref/Hyperlinks.html b/html-test/ref/Hyperlinks.html
index 964da904..bb19f4bc 100644
--- a/html-test/ref/Hyperlinks.html
+++ b/html-test/ref/Hyperlinks.html
@@ -59,10 +59,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Hyperlinks.html&q
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/IgnoreExports.html b/html-test/ref/IgnoreExports.html
index cd8d2388..746a3aa5 100644
--- a/html-test/ref/IgnoreExports.html
+++ b/html-test/ref/IgnoreExports.html
@@ -65,10 +65,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_IgnoreExports.htm
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -77,10 +79,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_IgnoreExports.htm
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:bar" class="def"
+	  ><a id="v:bar" class="def"
 	    >bar</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/ImplicitParams.html b/html-test/ref/ImplicitParams.html
index 68656338..95128b9d 100644
--- a/html-test/ref/ImplicitParams.html
+++ b/html-test/ref/ImplicitParams.html
@@ -49,8 +49,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_ImplicitParams.ht
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:X" class="def"
+	    > <a id="t:X" class="def"
 	    >X</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -58,7 +60,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_ImplicitParams.ht
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:X" class="def"
+		><a id="v:X" class="def"
 		  >X</a
 		  ></td
 		><td class="doc empty"
@@ -69,17 +71,19 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_ImplicitParams.ht
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:c" class="def"
+	  ><a id="v:c" class="def"
 	    >c</a
 	    > :: (?x :: <a href="#"
 	    >X</a
 	    >) =&gt; <a href="#"
 	    >X</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:d" class="def"
+	  ><a id="v:d" class="def"
 	    >d</a
 	    > :: (?x :: <a href="#"
 	    >X</a
@@ -89,15 +93,19 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_ImplicitParams.ht
 	    >X</a
 	    >, <a href="#"
 	    >X</a
-	    >)</p
+	    >) <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f" class="def"
+	  ><a id="v:f" class="def"
 	    >f</a
 	    > :: ((?x :: <a href="#"
 	    >X</a
-	    >) =&gt; a) -&gt; a</p
+	    >) =&gt; a) -&gt; a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	></div
       ></div
diff --git a/html-test/ref/Instances.html b/html-test/ref/Instances.html
index c2904e42..e3a2cb78 100644
--- a/html-test/ref/Instances.html
+++ b/html-test/ref/Instances.html
@@ -49,16 +49,18 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > a <a href="#" id="t:-60--126--126-" class="def"
+	    > a <a id="t:-60--126--126-" class="def"
 	    >&lt;~~</a
-	    > b</p
+	    > b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
 	    >Constructors</p
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:Xyzzy" class="def"
+		><a id="v:Xyzzy" class="def"
 		  >Xyzzy</a
 		  > (b -&gt; (a, a))</td
 		><td class="doc empty"
@@ -81,6 +83,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > (<a href="#"
 		      >(&lt;~~)</a
 		      > a)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -100,7 +104,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Int</a
 			  >) -&gt; a -&gt; a <a href="#"
 			  >&lt;~~</a
-			  > a</p
+			  > a <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
@@ -116,7 +122,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >&lt;~~</a
 			  > <a href="#"
 			  >Int</a
-			  >)</p
+			  >) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -129,28 +137,34 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:Foo" class="def"
+	    > <a id="t:Foo" class="def"
 	    >Foo</a
 	    > f <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:foo" class="def"
+	    ><a id="v:foo" class="def"
 	      >foo</a
 	      > :: f <a href="#"
 	      >Int</a
-	      > -&gt; a -&gt; f a</p
+	      > -&gt; a -&gt; f a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:foo-39-" class="def"
+	    ><a id="v:foo-39-" class="def"
 	      >foo'</a
 	      > :: f (f a) -&gt; <a href="#"
 	      >Int</a
 	      > -&gt; f (f <a href="#"
 	      >Int</a
-	      >)</p
+	      >) <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ><div class="subs instances"
 	  ><p id="control.i:Foo" class="caption collapser" onclick="toggleSection('i:Foo')"
@@ -165,6 +179,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > <a href="#"
 		      >Foo</a
 		      > []</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -180,7 +196,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >foo</a
 			  > :: [<a href="#"
 			  >Int</a
-			  >] -&gt; a -&gt; [a]</p
+			  >] -&gt; a -&gt; [a] <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
@@ -188,7 +206,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Int</a
 			  > -&gt; [[<a href="#"
 			  >Int</a
-			  >]]</p
+			  >]] <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -203,6 +223,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > <a href="#"
 		      >Maybe</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -222,7 +244,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Int</a
 			  > -&gt; a -&gt; <a href="#"
 			  >Maybe</a
-			  > a</p
+			  > a <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
@@ -238,7 +262,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Maybe</a
 			  > <a href="#"
 			  >Int</a
-			  >)</p
+			  >) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -251,6 +277,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > <a href="#"
 		      >Foo</a
 		      > ((-&gt;) a)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -266,7 +294,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >foo</a
 			  > :: (a -&gt; <a href="#"
 			  >Int</a
-			  >) -&gt; a -&gt; a -&gt; a</p
+			  >) -&gt; a -&gt; a -&gt; a <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
@@ -274,6 +304,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Int</a
 			  > -&gt; a -&gt; a -&gt; <a href="#"
 			  >Int</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			></div
 		      ></div
@@ -289,6 +321,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > (<a href="#"
 		      >Either</a
 		      > a)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -308,7 +342,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Int</a
 			  > -&gt; a -&gt; <a href="#"
 			  >Either</a
-			  > a a</p
+			  > a a <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
@@ -324,7 +360,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Either</a
 			  > a <a href="#"
 			  >Int</a
-			  >)</p
+			  >) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -343,6 +381,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > (<a href="#"
 		      >(,)</a
 		      > (f a))</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -358,7 +398,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >foo</a
 			  > :: (f a, <a href="#"
 			  >Int</a
-			  >) -&gt; a -&gt; (f a, a)</p
+			  >) -&gt; a -&gt; (f a, a) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
@@ -366,7 +408,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Int</a
 			  > -&gt; (f a, (f a, <a href="#"
 			  >Int</a
-			  >))</p
+			  >)) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -381,6 +425,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > (<a href="#"
 		      >(&lt;~~)</a
 		      > a)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -400,7 +446,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Int</a
 			  >) -&gt; a -&gt; a <a href="#"
 			  >&lt;~~</a
-			  > a</p
+			  > a <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
@@ -416,7 +464,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >&lt;~~</a
 			  > <a href="#"
 			  >Int</a
-			  >)</p
+			  >) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -431,6 +481,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > (<a href="#"
 		      >(,,)</a
 		      > a a)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -446,7 +498,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >foo</a
 			  > :: (a, a, <a href="#"
 			  >Int</a
-			  >) -&gt; a -&gt; (a, a, a)</p
+			  >) -&gt; a -&gt; (a, a, a) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
@@ -454,7 +508,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Int</a
 			  > -&gt; (a, a, (a, a, <a href="#"
 			  >Int</a
-			  >))</p
+			  >)) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -469,6 +525,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > (<a href="#"
 		      >Quux</a
 		      > a b)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -488,7 +546,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Int</a
 			  > -&gt; a -&gt; <a href="#"
 			  >Quux</a
-			  > a b a</p
+			  > a b a <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
@@ -504,7 +564,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Quux</a
 			  > a b <a href="#"
 			  >Int</a
-			  >)</p
+			  >) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -519,30 +581,38 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 	    >class</span
 	    > <a href="#"
 	    >Foo</a
-	    > f =&gt; <a href="#" id="t:Bar" class="def"
+	    > f =&gt; <a id="t:Bar" class="def"
 	    >Bar</a
 	    > f a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:bar" class="def"
+	    ><a id="v:bar" class="def"
 	      >bar</a
 	      > :: f a -&gt; f <a href="#"
 	      >Bool</a
-	      > -&gt; a</p
+	      > -&gt; a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:bar-39-" class="def"
+	    ><a id="v:bar-39-" class="def"
 	      >bar'</a
-	      > :: f (f a) -&gt; f (f (f b))</p
+	      > :: f (f a) -&gt; f (f (f b)) <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:bar0" class="def"
+	    ><a id="v:bar0" class="def"
 	      >bar0</a
-	      >, <a href="#" id="v:bar1" class="def"
+	      >, <a id="v:bar1" class="def"
 	      >bar1</a
-	      > :: (f a, f a) -&gt; (f b, f c)</p
+	      > :: (f a, f a) -&gt; (f b, f c) <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ><div class="subs instances"
 	  ><p id="control.i:Bar" class="caption collapser" onclick="toggleSection('i:Bar')"
@@ -561,6 +631,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > <a href="#"
 		      >Bool</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -584,6 +656,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Bool</a
 			  > -&gt; <a href="#"
 			  >Bool</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -600,7 +674,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Maybe</a
 			  > (<a href="#"
 			  >Maybe</a
-			  > b))</p
+			  > b)) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar0</a
@@ -616,7 +692,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Maybe</a
 			  > b, <a href="#"
 			  >Maybe</a
-			  > c)</p
+			  > c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar1</a
@@ -632,7 +710,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Maybe</a
 			  > b, <a href="#"
 			  >Maybe</a
-			  > c)</p
+			  > c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -647,6 +727,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > <a href="#"
 		      >Maybe</a
 		      > [a]</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -666,7 +748,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Maybe</a
 			  > <a href="#"
 			  >Bool</a
-			  > -&gt; [a]</p
+			  > -&gt; [a] <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar'</a
@@ -680,7 +764,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Maybe</a
 			  > (<a href="#"
 			  >Maybe</a
-			  > b))</p
+			  > b)) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar0</a
@@ -692,7 +778,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Maybe</a
 			  > b, <a href="#"
 			  >Maybe</a
-			  > c)</p
+			  > c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar1</a
@@ -704,7 +792,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Maybe</a
 			  > b, <a href="#"
 			  >Maybe</a
-			  > c)</p
+			  > c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -717,6 +807,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > <a href="#"
 		      >Bar</a
 		      > [] (a, a)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -732,19 +824,27 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >bar</a
 			  > :: [(a, a)] -&gt; [<a href="#"
 			  >Bool</a
-			  >] -&gt; (a, a)</p
+			  >] -&gt; (a, a) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar'</a
-			  > :: [[(a, a)]] -&gt; [[[b]]]</p
+			  > :: [[(a, a)]] -&gt; [[[b]]] <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar0</a
-			  > :: ([(a, a)], [(a, a)]) -&gt; ([b], [c])</p
+			  > :: ([(a, a)], [(a, a)]) -&gt; ([b], [c]) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar1</a
-			  > :: ([(a, a)], [(a, a)]) -&gt; ([b], [c])</p
+			  > :: ([(a, a)], [(a, a)]) -&gt; ([b], [c]) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -761,6 +861,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > (<a href="#"
 		      >Either</a
 		      > a) (f a)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -780,7 +882,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Either</a
 			  > a <a href="#"
 			  >Bool</a
-			  > -&gt; f a</p
+			  > -&gt; f a <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar'</a
@@ -794,7 +898,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Either</a
 			  > a (<a href="#"
 			  >Either</a
-			  > a b))</p
+			  > a b)) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar0</a
@@ -806,7 +912,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Either</a
 			  > a b, <a href="#"
 			  >Either</a
-			  > a c)</p
+			  > a c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar1</a
@@ -818,7 +926,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Either</a
 			  > a b, <a href="#"
 			  >Either</a
-			  > a c)</p
+			  > a c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -837,6 +947,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > (<a href="#"
 		      >(,,)</a
 		      > a b) (a, b, a)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -852,19 +964,27 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >bar</a
 			  > :: (a, b, (a, b, a)) -&gt; (a, b, <a href="#"
 			  >Bool</a
-			  >) -&gt; (a, b, a)</p
+			  >) -&gt; (a, b, a) <a href="#" class="selflink"
+			  >#</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
+			  > :: (a, b, (a, b, (a, b, a))) -&gt; (a, b, (a, b, (a, b, b))) <a href="#" class="selflink"
+			  >#</a
+			  ></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
+			  > :: ((a, b, (a, b, a)), (a, b, (a, b, a))) -&gt; ((a, b, b), (a, b, c)) <a href="#" class="selflink"
+			  >#</a
+			  ></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
+			  > :: ((a, b, (a, b, a)), (a, b, (a, b, a))) -&gt; ((a, b, b), (a, b, c)) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -881,6 +1001,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > a c) (<a href="#"
 		      >Quux</a
 		      > a b c)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -904,7 +1026,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Bool</a
 			  > -&gt; <a href="#"
 			  >Quux</a
-			  > a b c</p
+			  > a b c <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar'</a
@@ -920,7 +1044,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Quux</a
 			  > a c (<a href="#"
 			  >Quux</a
-			  > a c b))</p
+			  > a c b)) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar0</a
@@ -936,7 +1062,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Quux</a
 			  > a c b, <a href="#"
 			  >Quux</a
-			  > a c c)</p
+			  > a c c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar1</a
@@ -952,7 +1080,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Quux</a
 			  > a c b, <a href="#"
 			  >Quux</a
-			  > a c c)</p
+			  > a c c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -965,32 +1095,38 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:Baz" class="def"
+	    > <a id="t:Baz" class="def"
 	    >Baz</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:baz" class="def"
+	    ><a 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
+	      > c. c -&gt; a) -&gt; (b, c) <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:baz-39-" class="def"
+	    ><a 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
+	      > b. b -&gt; a) -&gt; [(b, a)] <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:baz-39--39-" class="def"
+	    ><a id="v:baz-39--39-" class="def"
 	      >baz''</a
 	      > :: b -&gt; (<span class="keyword"
 	      >forall</span
@@ -998,7 +1134,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 	      >forall</span
 	      > b. b -&gt; a) -&gt; c) -&gt; <span class="keyword"
 	      >forall</span
-	      > c. c -&gt; b</p
+	      > c. c -&gt; b <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ><div class="subs instances"
 	  ><p id="control.i:Baz" class="caption collapser" onclick="toggleSection('i:Baz')"
@@ -1013,6 +1151,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > <a href="#"
 		      >Baz</a
 		      > [c]</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1030,7 +1170,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >forall</span
 			  > a. a -&gt; a) -&gt; (b, <span class="keyword"
 			  >forall</span
-			  > a. a -&gt; [c]) -&gt; (b, c)</p
+			  > a. a -&gt; [c]) -&gt; (b, c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >baz'</a
@@ -1038,7 +1180,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >forall</span
 			  > b. b -&gt; [c]) -&gt; (<span class="keyword"
 			  >forall</span
-			  > b. b -&gt; [c]) -&gt; [(b, [c])]</p
+			  > b. b -&gt; [c]) -&gt; [(b, [c])] <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >baz''</a
@@ -1048,7 +1192,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >forall</span
 			  > a. a -&gt; [c]) -&gt; c) -&gt; <span class="keyword"
 			  >forall</span
-			  > a. a -&gt; b</p
+			  > a. a -&gt; b <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -1061,6 +1207,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > <a href="#"
 		      >Baz</a
 		      > (a -&gt; b)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1078,7 +1226,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >forall</span
 			  > c. c -&gt; c) -&gt; (b, <span class="keyword"
 			  >forall</span
-			  > c. c -&gt; a -&gt; b) -&gt; (b, c)</p
+			  > c. c -&gt; a -&gt; b) -&gt; (b, c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >baz'</a
@@ -1086,7 +1236,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >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
+			  > c. c -&gt; a -&gt; b) -&gt; [(b, a -&gt; b)] <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >baz''</a
@@ -1096,7 +1248,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >forall</span
 			  > d. d -&gt; a -&gt; b) -&gt; c) -&gt; <span class="keyword"
 			  >forall</span
-			  > c. c -&gt; b</p
+			  > c. c -&gt; b <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -1109,6 +1263,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > <a href="#"
 		      >Baz</a
 		      > (a, b, c)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1126,7 +1282,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >forall</span
 			  > d. d -&gt; d) -&gt; (b, <span class="keyword"
 			  >forall</span
-			  > d. d -&gt; (a, b, c)) -&gt; (b, c)</p
+			  > d. d -&gt; (a, b, c)) -&gt; (b, c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >baz'</a
@@ -1134,7 +1292,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >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
+			  > d. d -&gt; (a, b, c)) -&gt; [(b, (a, b, c))] <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >baz''</a
@@ -1144,7 +1304,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >forall</span
 			  > e. e -&gt; (a, b, c)) -&gt; c) -&gt; <span class="keyword"
 			  >forall</span
-			  > d. d -&gt; b</p
+			  > d. d -&gt; b <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -1159,6 +1321,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > (<a href="#"
 		      >Quux</a
 		      > a b c)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1180,7 +1344,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >forall</span
 			  > d. d -&gt; <a href="#"
 			  >Quux</a
-			  > a b c) -&gt; (b, c)</p
+			  > a b c) -&gt; (b, c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >baz'</a
@@ -1194,7 +1360,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Quux</a
 			  > a b c) -&gt; [(b, <a href="#"
 			  >Quux</a
-			  > a b c)]</p
+			  > a b c)] <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >baz''</a
@@ -1206,7 +1374,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Quux</a
 			  > a b c) -&gt; c) -&gt; <span class="keyword"
 			  >forall</span
-			  > d. d -&gt; b</p
+			  > d. d -&gt; b <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -1219,6 +1389,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > <a href="#"
 		      >Baz</a
 		      > (a, [b], b, a)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1236,7 +1408,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >forall</span
 			  > c. c -&gt; c) -&gt; (b, <span class="keyword"
 			  >forall</span
-			  > c. c -&gt; (a, [b], b, a)) -&gt; (b, c)</p
+			  > c. c -&gt; (a, [b], b, a)) -&gt; (b, c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >baz'</a
@@ -1244,7 +1418,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >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
+			  > c. c -&gt; (a, [b], b, a)) -&gt; [(b, (a, [b], b, a))] <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >baz''</a
@@ -1254,7 +1430,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >forall</span
 			  > d. d -&gt; (a, [b], b, a)) -&gt; c) -&gt; <span class="keyword"
 			  >forall</span
-			  > c. c -&gt; b</p
+			  > c. c -&gt; b <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -1267,16 +1445,18 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Quux" class="def"
+	    > <a id="t:Quux" class="def"
 	    >Quux</a
-	    > a b c</p
+	    > a b c <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
 	    >Constructors</p
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:Qx" class="def"
+		><a id="v:Qx" class="def"
 		  >Qx</a
 		  > a</td
 		><td class="doc empty"
@@ -1284,7 +1464,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:Qux" class="def"
+		><a id="v:Qux" class="def"
 		  >Qux</a
 		  > a b</td
 		><td class="doc empty"
@@ -1292,7 +1472,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:Quux" class="def"
+		><a id="v:Quux" class="def"
 		  >Quux</a
 		  > a b c</td
 		><td class="doc empty"
@@ -1315,6 +1495,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > (<a href="#"
 		      >Quux</a
 		      > a b)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1334,7 +1516,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Int</a
 			  > -&gt; a -&gt; <a href="#"
 			  >Quux</a
-			  > a b a</p
+			  > a b a <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >foo'</a
@@ -1350,7 +1534,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Quux</a
 			  > a b <a href="#"
 			  >Int</a
-			  >)</p
+			  >) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -1367,6 +1553,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > a c) (<a href="#"
 		      >Quux</a
 		      > a b c)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1390,7 +1578,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Bool</a
 			  > -&gt; <a href="#"
 			  >Quux</a
-			  > a b c</p
+			  > a b c <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar'</a
@@ -1406,7 +1596,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Quux</a
 			  > a c (<a href="#"
 			  >Quux</a
-			  > a c b))</p
+			  > a c b)) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar0</a
@@ -1422,7 +1614,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Quux</a
 			  > a c b, <a href="#"
 			  >Quux</a
-			  > a c c)</p
+			  > a c c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >bar1</a
@@ -1438,7 +1632,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Quux</a
 			  > a c b, <a href="#"
 			  >Quux</a
-			  > a c c)</p
+			  > a c c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -1453,6 +1649,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > (<a href="#"
 		      >Quux</a
 		      > a b c)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1474,7 +1672,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >forall</span
 			  > d. d -&gt; <a href="#"
 			  >Quux</a
-			  > a b c) -&gt; (b, c)</p
+			  > a b c) -&gt; (b, c) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >baz'</a
@@ -1488,7 +1688,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Quux</a
 			  > a b c) -&gt; [(b, <a href="#"
 			  >Quux</a
-			  > a b c)]</p
+			  > a b c)] <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >baz''</a
@@ -1500,7 +1702,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Quux</a
 			  > a b c) -&gt; c) -&gt; <span class="keyword"
 			  >forall</span
-			  > d. d -&gt; b</p
+			  > d. d -&gt; b <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -1518,11 +1722,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      >Quux</a
 		      > a [a] c) <ul class="inst"
 		      ><li class="inst"
-			>= <a href="#" id="v:Thuud" class="def"
+			>= <a id="v:Thuud" class="def"
 			  >Thuud</a
 			  > a</li
 			><li class="inst"
-			>| <a href="#" id="v:Thuuud" class="def"
+			>| <a id="v:Thuuud" class="def"
 			  >Thuuud</a
 			  > <a href="#"
 			  >Int</a
@@ -1531,6 +1735,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  ></li
 			></ul
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1543,10 +1749,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:Norf" class="def"
+	    > <a id="t:Norf" class="def"
 	    >Norf</a
 	    > a b <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs associated-types"
 	  ><p class="caption"
@@ -1554,25 +1762,31 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 	    ><p class="src"
 	    ><span class="keyword"
 	      >type</span
-	      > <a href="#" id="t:Plugh" class="def"
+	      > <a id="t:Plugh" class="def"
 	      >Plugh</a
-	      > a c b</p
+	      > a c b <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
 	    ><span class="keyword"
 	      >data</span
-	      > <a href="#" id="t:Thud" class="def"
+	      > <a id="t:Thud" class="def"
 	      >Thud</a
-	      > a c</p
+	      > a c <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:norf" class="def"
+	    ><a id="v:norf" class="def"
 	      >norf</a
 	      > :: <a href="#"
 	      >Plugh</a
-	      > a c b -&gt; a -&gt; (a -&gt; c) -&gt; b</p
+	      > a c b -&gt; a -&gt; (a -&gt; c) -&gt; b <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ><div class="subs instances"
 	  ><p id="control.i:Norf" class="caption collapser" onclick="toggleSection('i:Norf')"
@@ -1591,6 +1805,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > <a href="#"
 		      >Bool</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1612,6 +1828,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Bool</a
 			  > :: <a href="#"
 			  >*</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><span class="keyword"
@@ -1622,6 +1840,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Int</a
 			  > c :: <a href="#"
 			  >*</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			></div
 		      > <div class="subs methods"
@@ -1642,6 +1862,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Int</a
 			  > -&gt; c) -&gt; <a href="#"
 			  >Bool</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			></div
 		      ></div
@@ -1655,6 +1877,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 		      > <a href="#"
 		      >Norf</a
 		      > [a] [b]</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1672,6 +1896,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Plugh</a
 			  > [a] c [b] :: <a href="#"
 			  >*</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><span class="keyword"
@@ -1680,6 +1906,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >Thud</a
 			  > [a] c :: <a href="#"
 			  >*</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			></div
 		      > <div class="subs methods"
@@ -1690,7 +1918,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Instances.html&qu
 			  >norf</a
 			  > :: <a href="#"
 			  >Plugh</a
-			  > [a] c [b] -&gt; [a] -&gt; ([a] -&gt; c) -&gt; [b]</p
+			  > [a] c [b] -&gt; [a] -&gt; ([a] -&gt; c) -&gt; [b] <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
diff --git a/html-test/ref/Math.html b/html-test/ref/Math.html
index e2e962f6..9f054ccc 100644
--- a/html-test/ref/Math.html
+++ b/html-test/ref/Math.html
@@ -75,10 +75,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Math.html&quot;);
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f" class="def"
+	  ><a id="v:f" class="def"
 	    >f</a
 	    > :: <a href="#"
 	    >Integer</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/Minimal.html b/html-test/ref/Minimal.html
index eb9d1f5d..721260c6 100644
--- a/html-test/ref/Minimal.html
+++ b/html-test/ref/Minimal.html
@@ -57,10 +57,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:Foo" class="def"
+	    > <a id="t:Foo" class="def"
 	    >Foo</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs minimal"
 	  ><p class="caption"
@@ -86,25 +88,33 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:foo" class="def"
+	    ><a id="v:foo" class="def"
 	      >foo</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><div class="doc"
 	    ><p
 	      >Any two of these are required...</p
 	      ></div
 	    ><p class="src"
-	    ><a href="#" id="v:bar" class="def"
+	    ><a id="v:bar" class="def"
 	      >bar</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:bat" class="def"
+	    ><a id="v:bat" class="def"
 	      >bat</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:fooBarBat" class="def"
+	    ><a id="v:fooBarBat" class="def"
 	      >fooBarBat</a
-	      > :: (a, a, a)</p
+	      > :: (a, a, a) <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><div class="doc"
 	    ><p
 	      >.. or just this</p
@@ -115,10 +125,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:Weird" class="def"
+	    > <a id="t:Weird" class="def"
 	    >Weird</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs minimal"
 	  ><p class="caption"
@@ -144,43 +156,59 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:a" class="def"
+	    ><a id="v:a" class="def"
 	      >a</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:b" class="def"
+	    ><a id="v:b" class="def"
 	      >b</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:c" class="def"
+	    ><a id="v:c" class="def"
 	      >c</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:d" class="def"
+	    ><a id="v:d" class="def"
 	      >d</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:e" class="def"
+	    ><a id="v:e" class="def"
 	      >e</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:f" class="def"
+	    ><a id="v:f" class="def"
 	      >f</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:g" class="def"
+	    ><a id="v:g" class="def"
 	      >g</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:NoMins" class="def"
+	    > <a id="t:NoMins" class="def"
 	    >NoMins</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs minimal"
 	  ><p class="caption"
@@ -196,27 +224,35 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:x" class="def"
+	    ><a id="v:x" class="def"
 	      >x</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:y" class="def"
+	    ><a id="v:y" class="def"
 	      >y</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:z" class="def"
+	    ><a id="v:z" class="def"
 	      >z</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:FullMin" class="def"
+	    > <a id="t:FullMin" class="def"
 	    >FullMin</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs minimal"
 	  ><p class="caption"
@@ -232,23 +268,29 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:aaa" class="def"
+	    ><a id="v:aaa" class="def"
 	      >aaa</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:bbb" class="def"
+	    ><a id="v:bbb" class="def"
 	      >bbb</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:PartialMin" class="def"
+	    > <a id="t:PartialMin" class="def"
 	    >PartialMin</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs minimal"
 	  ><p class="caption"
@@ -262,31 +304,39 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Minimal.html&quot
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:ccc" class="def"
+	    ><a id="v:ccc" class="def"
 	      >ccc</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:EmptyMin" class="def"
+	    > <a id="t:EmptyMin" class="def"
 	    >EmptyMin</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:eee" class="def"
+	    ><a id="v:eee" class="def"
 	      >eee</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:fff" class="def"
+	    ><a id="v:fff" class="def"
 	      >fff</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ></div
 	></div
diff --git a/html-test/ref/ModuleWithWarning.html b/html-test/ref/ModuleWithWarning.html
index ff6b6c65..776edd9b 100644
--- a/html-test/ref/ModuleWithWarning.html
+++ b/html-test/ref/ModuleWithWarning.html
@@ -63,10 +63,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_ModuleWithWarning
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	></div
diff --git a/html-test/ref/Nesting.html b/html-test/ref/Nesting.html
index 37266c5d..d98a75eb 100644
--- a/html-test/ref/Nesting.html
+++ b/html-test/ref/Nesting.html
@@ -85,9 +85,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Nesting.html&quot
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:d" class="def"
+	  ><a id="v:d" class="def"
 	    >d</a
-	    > :: t</p
+	    > :: t <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><ul
 	    ><li
@@ -117,9 +119,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Nesting.html&quot
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:e" class="def"
+	  ><a id="v:e" class="def"
 	    >e</a
-	    > :: t</p
+	    > :: t <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><ul
 	    ><li
@@ -138,9 +142,11 @@ 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 id="v:f" class="def"
 	    >f</a
-	    > :: t</p
+	    > :: t <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><ul
 	    ><li
@@ -156,9 +162,11 @@ 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 id="v:g" class="def"
 	    >g</a
-	    > :: t</p
+	    > :: t <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><ul
 	    ><li
@@ -174,9 +182,11 @@ 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 id="v:h" class="def"
 	    >h</a
-	    > :: t</p
+	    > :: t <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><ul
 	    ><li
@@ -192,9 +202,11 @@ tracks</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:i" class="def"
+	  ><a id="v:i" class="def"
 	    >i</a
-	    > :: t</p
+	    > :: t <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><ul
 	    ><li
@@ -242,9 +254,11 @@ More of the indented list.</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:j" class="def"
+	  ><a id="v:j" class="def"
 	    >j</a
-	    > :: t</p
+	    > :: t <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><dl
 	    ><dt
@@ -310,9 +324,11 @@ with more of the indented list content.</p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:k" class="def"
+	  ><a id="v:k" class="def"
 	    >k</a
-	    > :: t</p
+	    > :: t <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><ul
 	    ><li
diff --git a/html-test/ref/NoLayout.html b/html-test/ref/NoLayout.html
index 23017d56..061b5d42 100644
--- a/html-test/ref/NoLayout.html
+++ b/html-test/ref/NoLayout.html
@@ -59,10 +59,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_NoLayout.html&quo
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:g" class="def"
+	  ><a id="v:g" class="def"
 	    >g</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/NonGreedy.html b/html-test/ref/NonGreedy.html
index 9530b46b..ea18c7c4 100644
--- a/html-test/ref/NonGreedy.html
+++ b/html-test/ref/NonGreedy.html
@@ -57,9 +57,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_NonGreedy.html&qu
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f" class="def"
+	  ><a id="v:f" class="def"
 	    >f</a
-	    > :: a</p
+	    > :: a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    ><a href="#"
diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index e22147d6..6c795d85 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -165,9 +165,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:-43--45-" class="def"
+	  ><a id="v:-43--45-" class="def"
 	    >(+-)</a
-	    > :: a -&gt; a -&gt; a</p
+	    > :: a -&gt; a -&gt; a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Operator with no fixity</p
@@ -175,12 +177,14 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:-42--47-" class="def"
+	  ><a id="v:-42--47-" class="def"
 	    >(*/)</a
 	    > :: a -&gt; a -&gt; a <span class="fixity"
 	    >infixr 7</span
 	    ><span class="rightedge"
 	    ></span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -189,12 +193,14 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
 	    > :: a -&gt; a -&gt; a <span class="fixity"
 	    >infixl 3</span
 	    ><span class="rightedge"
 	    ></span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -205,8 +211,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Foo" class="def"
+	    > <a id="t:Foo" class="def"
 	    >Foo</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -220,7 +228,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	      ><td class="src"
 		><a href="#"
 		  >Foo</a
-		  > <a href="#" id="v:Bar" class="def"
+		  > <a id="v:Bar" class="def"
 		  >`Bar`</a
 		  > <a href="#"
 		  >Foo</a
@@ -238,7 +246,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	      ><td class="src"
 		><a href="#"
 		  >Foo</a
-		  > <a href="#" id="v::-45-" class="def"
+		  > <a id="v::-45-" class="def"
 		  >:-</a
 		  > <a href="#"
 		  >Foo</a
@@ -259,7 +267,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	><p class="src"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a href="#" id="v::-43-" class="def"
+	    > <a id="v::-43-" class="def"
 	    >(:+)</a
 	    > :: <span class="keyword"
 	    >forall</span
@@ -267,6 +275,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	    >infixr 3</span
 	    ><span class="rightedge"
 	    ></span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -277,7 +287,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a href="#" id="t:-60--45--62-" class="def"
+	    > a <a id="t:-60--45--62-" class="def"
 	    >&lt;-&gt;</a
 	    > b <span class="keyword"
 	    >where</span
@@ -285,6 +295,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	    >infixl 6</span
 	    ><span class="rightedge"
 	    ></span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -296,7 +308,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v::-60--45--62-" class="def"
+		><a id="v::-60--45--62-" class="def"
 		  >(:&lt;-&gt;)</a
 		  > :: a -&gt; b -&gt; a <a href="#"
 		  >&lt;-&gt;</a
@@ -315,12 +327,14 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > a <a href="#" id="t:-43--43-" class="def"
+	    > a <a id="t:-43--43-" class="def"
 	    >++</a
 	    > b <span class="fixity"
 	    >infix 3</span
 	    ><span class="rightedge"
 	    ></span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -331,12 +345,14 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > a <a href="#" id="t:-42--42-" class="def"
+	    > a <a id="t:-42--42-" class="def"
 	    >**</a
 	    > b <span class="fixity"
 	    >infix 9</span
 	    ><span class="rightedge"
 	    ></span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -347,7 +363,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > a <a href="#" id="t:-62--60--62-" class="def"
+	    > a <a id="t:-62--60--62-" class="def"
 	    >&gt;&lt;&gt;</a
 	    > b | a -&gt; b <span class="keyword"
 	    >where</span
@@ -355,6 +371,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	    >infixr 1</span
 	    ><span class="rightedge"
 	    ></span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -384,7 +402,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	    ><p class="src"
 	    ><span class="keyword"
 	      >type</span
-	      > a <a href="#" id="t:-60--62--60-" class="def"
+	      > a <a id="t:-60--62--60-" class="def"
 	      >&lt;&gt;&lt;</a
 	      > b :: <a href="#"
 	      >*</a
@@ -392,25 +410,29 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	      >infixl 2</span
 	      ><span class="rightedge"
 	      ></span
+	      > <a href="#" class="selflink"
+	      >#</a
 	      ></p
 	    ><p class="src"
 	    ><span class="keyword"
 	      >data</span
-	      > a <a href="#" id="t:-62--60--60-" class="def"
+	      > a <a id="t:-62--60--60-" class="def"
 	      >&gt;&lt;&lt;</a
 	      > b <span class="fixity"
 	      >infixl 3</span
 	      ><span class="rightedge"
 	      ></span
+	      > <a href="#" class="selflink"
+	      >#</a
 	      ></p
 	    ></div
 	  ><div class="subs methods"
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:-62--62--60-" class="def"
+	    ><a id="v:-62--62--60-" class="def"
 	      >(&gt;&gt;&lt;)</a
-	      >, <a href="#" id="v:-60--60--62-" class="def"
+	      >, <a id="v:-60--60--62-" class="def"
 	      >(&lt;&lt;&gt;)</a
 	      > :: a -&gt; b -&gt; () <span class="fixity"
 	      >infixl 5 &lt;&lt;&gt;</span
@@ -418,15 +440,17 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	      >infixr 4 &gt;&gt;&lt;</span
 	      ><span class="rightedge"
 	      ></span
+	      > <a href="#" class="selflink"
+	      >#</a
 	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:-42--42--62-" class="def"
+	    ><a id="v:-42--42--62-" class="def"
 	      >(**&gt;)</a
-	      >, <a href="#" id="v:-42--42--60-" class="def"
+	      >, <a id="v:-42--42--60-" class="def"
 	      >(**&lt;)</a
-	      >, <a href="#" id="v:-62--42--42-" class="def"
+	      >, <a id="v:-62--42--42-" class="def"
 	      >(&gt;**)</a
-	      >, <a href="#" id="v:-60--42--42-" class="def"
+	      >, <a id="v:-60--42--42-" class="def"
 	      >(&lt;**)</a
 	      > :: a -&gt; a -&gt; () <span class="fixity"
 	      >infixr 8 **&gt;, &gt;**</span
@@ -434,6 +458,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	      >infixl 8 **&lt;, &lt;**</span
 	      ><span class="rightedge"
 	      ></span
+	      > <a href="#" class="selflink"
+	      >#</a
 	      ></p
 	    ><div class="doc"
 	    ><p
@@ -445,7 +471,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	><p class="src"
 	  ><span class="keyword"
 	    >type</span
-	    > <a href="#" id="t:-62--45--60-" class="def"
+	    > <a id="t:-62--45--60-" class="def"
 	    >(&gt;-&lt;)</a
 	    > a b = a <a href="#"
 	    >&lt;-&gt;</a
@@ -453,6 +479,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Operators.html&qu
 	    >infixl 6</span
 	    ><span class="rightedge"
 	    ></span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/OrphanInstances.html b/html-test/ref/OrphanInstances.html
index 0ece21f5..a5accfdf 100644
--- a/html-test/ref/OrphanInstances.html
+++ b/html-test/ref/OrphanInstances.html
@@ -75,6 +75,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_OrphanInstances.h
 		  > <a href="#"
 		  >AType</a
 		  ></span
+		> <a href="#" class="selflink"
+		>#</a
 		></td
 	      ><td class="doc"
 	      ><p
@@ -94,6 +96,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_OrphanInstances.h
 		      >AType</a
 		      > -&gt; <a href="#"
 		      >Int</a
+		      > <a href="#" class="selflink"
+		      >#</a
 		      ></p
 		    ></div
 		  ></div
diff --git a/html-test/ref/OrphanInstancesClass.html b/html-test/ref/OrphanInstancesClass.html
index 871fe6c0..0f1b31c9 100644
--- a/html-test/ref/OrphanInstancesClass.html
+++ b/html-test/ref/OrphanInstancesClass.html
@@ -49,10 +49,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_OrphanInstancesCl
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:AClass" class="def"
+	    > <a id="t:AClass" class="def"
 	    >AClass</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs minimal"
 	  ><p class="caption"
@@ -66,10 +68,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_OrphanInstancesCl
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:aClass" class="def"
+	    ><a id="v:aClass" class="def"
 	      >aClass</a
 	      > :: a -&gt; <a href="#"
 	      >Int</a
+	      > <a href="#" class="selflink"
+	      >#</a
 	      ></p
 	    ></div
 	  ></div
diff --git a/html-test/ref/OrphanInstancesType.html b/html-test/ref/OrphanInstancesType.html
index 0fc47009..ceabdaaa 100644
--- a/html-test/ref/OrphanInstancesType.html
+++ b/html-test/ref/OrphanInstancesType.html
@@ -49,8 +49,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_OrphanInstancesTy
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:AType" class="def"
+	    > <a id="t:AType" class="def"
 	    >AType</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -58,7 +60,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_OrphanInstancesTy
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:AType" class="def"
+		><a id="v:AType" class="def"
 		  >AType</a
 		  > <a href="#"
 		  >Int</a
diff --git a/html-test/ref/PatternSyns.html b/html-test/ref/PatternSyns.html
index 9347dfb8..ffebdf27 100644
--- a/html-test/ref/PatternSyns.html
+++ b/html-test/ref/PatternSyns.html
@@ -125,9 +125,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:FooType" class="def"
+	    > <a id="t:FooType" class="def"
 	    >FooType</a
-	    > x</p
+	    > x <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >FooType doc</p
@@ -138,7 +140,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:FooCtor" class="def"
+		><a id="v:FooCtor" class="def"
 		  >FooCtor</a
 		  > x</td
 		><td class="doc empty"
@@ -151,13 +153,15 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	><p class="src"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a href="#" id="v:Foo" class="def"
+	    > <a id="v:Foo" class="def"
 	    >Foo</a
 	    > :: <span class="keyword"
 	    >forall</span
 	    > t. t -&gt; <a href="#"
 	    >FooType</a
-	    > t</p
+	    > t <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Pattern synonym for <code
@@ -171,7 +175,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	><p class="src"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a href="#" id="v:Bar" class="def"
+	    > <a id="v:Bar" class="def"
 	    >Bar</a
 	    > :: <span class="keyword"
 	    >forall</span
@@ -179,7 +183,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >FooType</a
 	    > (<a href="#"
 	    >FooType</a
-	    > t)</p
+	    > t) <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Pattern synonym for <code
@@ -193,7 +199,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	><p class="src"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a href="#" id="v::-60--45--62-" class="def"
+	    > <a id="v::-60--45--62-" class="def"
 	    >(:&lt;-&gt;)</a
 	    > :: <span class="keyword"
 	    >forall</span
@@ -203,7 +209,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    >FooType</a
 	    > (<a href="#"
 	    >FooType</a
-	    > t))</p
+	    > t)) <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Pattern synonym for (<code
@@ -217,9 +225,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a href="#" id="t:-62--60-" class="def"
+	    > a <a id="t:-62--60-" class="def"
 	    >&gt;&lt;</a
-	    > b</p
+	    > b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Doc for (<code
@@ -234,7 +244,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:Empty" class="def"
+		><a id="v:Empty" class="def"
 		  >Empty</a
 		  ></td
 		><td class="doc empty"
@@ -247,13 +257,15 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PatternSyns.html&
 	><p class="src"
 	  ><span class="keyword"
 	    >pattern</span
-	    > <a href="#" id="v:E" class="def"
+	    > <a id="v:E" class="def"
 	    >E</a
 	    > :: <span class="keyword"
 	    >forall</span
 	    > k t t. <a href="#"
 	    >(&gt;&lt;)</a
-	    > k t t</p
+	    > k t t <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Pattern for <code
diff --git a/html-test/ref/PromotedTypes.html b/html-test/ref/PromotedTypes.html
index 7567d2f5..65aa0112 100644
--- a/html-test/ref/PromotedTypes.html
+++ b/html-test/ref/PromotedTypes.html
@@ -49,16 +49,18 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PromotedTypes.htm
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:RevList" class="def"
+	    > <a id="t:RevList" class="def"
 	    >RevList</a
-	    > a</p
+	    > a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
 	    >Constructors</p
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:RNil" class="def"
+		><a id="v:RNil" class="def"
 		  >RNil</a
 		  ></td
 		><td class="doc empty"
@@ -68,7 +70,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PromotedTypes.htm
 	      ><td class="src"
 		>(<a href="#"
 		  >RevList</a
-		  > a) <a href="#" id="v::-62-" class="def"
+		  > a) <a id="v::-62-" class="def"
 		  >:&gt;</a
 		  > a</td
 		><td class="doc empty"
@@ -81,7 +83,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PromotedTypes.htm
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Pattern" class="def"
+	    > <a id="t:Pattern" class="def"
 	    >Pattern</a
 	    > :: [<a href="#"
 	    >*</a
@@ -89,6 +91,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PromotedTypes.htm
 	    >*</a
 	    > <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -96,7 +100,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PromotedTypes.htm
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:Nil" class="def"
+		><a id="v:Nil" class="def"
 		  >Nil</a
 		  > :: <a href="#"
 		  >Pattern</a
@@ -106,7 +110,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PromotedTypes.htm
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:Cons" class="def"
+		><a id="v:Cons" class="def"
 		  >Cons</a
 		  > :: <a href="#"
 		  >Maybe</a
@@ -125,7 +129,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PromotedTypes.htm
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:RevPattern" class="def"
+	    > <a id="t:RevPattern" class="def"
 	    >RevPattern</a
 	    > :: <a href="#"
 	    >RevList</a
@@ -135,6 +139,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PromotedTypes.htm
 	    >*</a
 	    > <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -142,7 +148,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PromotedTypes.htm
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:RevNil" class="def"
+		><a id="v:RevNil" class="def"
 		  >RevNil</a
 		  > :: <a href="#"
 		  >RevPattern</a
@@ -154,7 +160,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PromotedTypes.htm
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:RevCons" class="def"
+		><a id="v:RevCons" class="def"
 		  >RevCons</a
 		  > :: <a href="#"
 		  >Maybe</a
@@ -175,7 +181,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PromotedTypes.htm
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Tuple" class="def"
+	    > <a id="t:Tuple" class="def"
 	    >Tuple</a
 	    > :: (<a href="#"
 	    >*</a
@@ -185,6 +191,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PromotedTypes.htm
 	    >*</a
 	    > <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -192,7 +200,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_PromotedTypes.htm
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:Tuple" class="def"
+		><a id="v:Tuple" class="def"
 		  >Tuple</a
 		  > :: a -&gt; b -&gt; <a href="#"
 		  >Tuple</a
diff --git a/html-test/ref/Properties.html b/html-test/ref/Properties.html
index e24d6265..4020bb45 100644
--- a/html-test/ref/Properties.html
+++ b/html-test/ref/Properties.html
@@ -61,12 +61,14 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Properties.html&q
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:fib" class="def"
+	  ><a id="v:fib" class="def"
 	    >fib</a
 	    > :: <a href="#"
 	    >Integer</a
 	    > -&gt; <a href="#"
 	    >Integer</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/QuasiExpr.html b/html-test/ref/QuasiExpr.html
index 45371eb9..37face02 100644
--- a/html-test/ref/QuasiExpr.html
+++ b/html-test/ref/QuasiExpr.html
@@ -49,8 +49,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Expr" class="def"
+	    > <a id="t:Expr" class="def"
 	    >Expr</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -58,7 +60,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:IntExpr" class="def"
+		><a id="v:IntExpr" class="def"
 		  >IntExpr</a
 		  > <a href="#"
 		  >Integer</a
@@ -68,7 +70,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:AntiIntExpr" class="def"
+		><a id="v:AntiIntExpr" class="def"
 		  >AntiIntExpr</a
 		  > <a href="#"
 		  >String</a
@@ -78,7 +80,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:BinopExpr" class="def"
+		><a id="v:BinopExpr" class="def"
 		  >BinopExpr</a
 		  > <a href="#"
 		  >BinOp</a
@@ -92,7 +94,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:AntiExpr" class="def"
+		><a id="v:AntiExpr" class="def"
 		  >AntiExpr</a
 		  > <a href="#"
 		  >String</a
@@ -117,6 +119,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 		      > <a href="#"
 		      >Expr</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -136,6 +140,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 			  >Expr</a
 			  > -&gt; <a href="#"
 			  >ShowS</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -144,6 +150,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 			  >Expr</a
 			  > -&gt; <a href="#"
 			  >String</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -152,6 +160,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 			  >Expr</a
 			  >] -&gt; <a href="#"
 			  >ShowS</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			></div
 		      ></div
@@ -165,8 +175,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:BinOp" class="def"
+	    > <a id="t:BinOp" class="def"
 	    >BinOp</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
@@ -174,7 +186,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:AddOp" class="def"
+		><a id="v:AddOp" class="def"
 		  >AddOp</a
 		  ></td
 		><td class="doc empty"
@@ -182,7 +194,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:SubOp" class="def"
+		><a id="v:SubOp" class="def"
 		  >SubOp</a
 		  ></td
 		><td class="doc empty"
@@ -190,7 +202,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:MulOp" class="def"
+		><a id="v:MulOp" class="def"
 		  >MulOp</a
 		  ></td
 		><td class="doc empty"
@@ -198,7 +210,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:DivOp" class="def"
+		><a id="v:DivOp" class="def"
 		  >DivOp</a
 		  ></td
 		><td class="doc empty"
@@ -221,6 +233,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 		      > <a href="#"
 		      >BinOp</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -240,6 +254,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 			  >BinOp</a
 			  > -&gt; <a href="#"
 			  >ShowS</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -248,6 +264,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 			  >BinOp</a
 			  > -&gt; <a href="#"
 			  >String</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><a href="#"
@@ -256,6 +274,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 			  >BinOp</a
 			  >] -&gt; <a href="#"
 			  >ShowS</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			></div
 		      ></div
@@ -267,27 +287,33 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiExpr.html&qu
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:eval" class="def"
+	  ><a id="v:eval" class="def"
 	    >eval</a
 	    > :: <a href="#"
 	    >Expr</a
 	    > -&gt; <a href="#"
 	    >Integer</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:expr" class="def"
+	  ><a id="v:expr" class="def"
 	    >expr</a
-	    > :: QuasiQuoter</p
+	    > :: QuasiQuoter <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:parseExprExp" class="def"
+	  ><a id="v:parseExprExp" class="def"
 	    >parseExprExp</a
 	    > :: <a href="#"
 	    >String</a
-	    > -&gt; Q Exp</p
+	    > -&gt; Q Exp <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	></div
       ></div
diff --git a/html-test/ref/QuasiQuote.html b/html-test/ref/QuasiQuote.html
index ad23b77d..5fa53bb0 100644
--- a/html-test/ref/QuasiQuote.html
+++ b/html-test/ref/QuasiQuote.html
@@ -47,10 +47,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_QuasiQuote.html&q
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:val" class="def"
+	  ><a id="v:val" class="def"
 	    >val</a
 	    > :: <a href="#"
 	    >Integer</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	></div
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index 243ab30b..b5aa56b3 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -75,9 +75,11 @@ Fix spurious superclass constraints bug.</pre
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:SomeType" class="def"
+	    > <a id="t:SomeType" class="def"
 	    >SomeType</a
-	    > f a</p
+	    > f a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="subs instances"
 	  ><p id="control.i:SomeType" class="caption collapser" onclick="toggleSection('i:SomeType')"
 	    >Instances</p
@@ -93,6 +95,8 @@ Fix spurious superclass constraints bug.</pre
 		      > (<a href="#"
 		      >SomeType</a
 		      > f)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -110,7 +114,9 @@ Fix spurious superclass constraints bug.</pre
 			  >SomeType</a
 			  > f a -&gt; <a href="#"
 			  >SomeType</a
-			  > f b</p
+			  > f b <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >(&lt;$)</a
@@ -118,7 +124,9 @@ Fix spurious superclass constraints bug.</pre
 			  >SomeType</a
 			  > f b -&gt; <a href="#"
 			  >SomeType</a
-			  > f a</p
+			  > f a <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -135,6 +143,8 @@ Fix spurious superclass constraints bug.</pre
 		      > (<a href="#"
 		      >SomeType</a
 		      > f)</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -150,7 +160,9 @@ Fix spurious superclass constraints bug.</pre
 			  >pure</a
 			  > :: a -&gt; <a href="#"
 			  >SomeType</a
-			  > f a</p
+			  > f a <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >(&lt;*&gt;)</a
@@ -160,7 +172,9 @@ Fix spurious superclass constraints bug.</pre
 			  >SomeType</a
 			  > f a -&gt; <a href="#"
 			  >SomeType</a
-			  > f b</p
+			  > f b <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >(*&gt;)</a
@@ -170,7 +184,9 @@ Fix spurious superclass constraints bug.</pre
 			  >SomeType</a
 			  > f b -&gt; <a href="#"
 			  >SomeType</a
-			  > f b</p
+			  > f b <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >(&lt;*)</a
@@ -180,7 +196,9 @@ Fix spurious superclass constraints bug.</pre
 			  >SomeType</a
 			  > f b -&gt; <a href="#"
 			  >SomeType</a
-			  > f a</p
+			  > f a <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
diff --git a/html-test/ref/TH.html b/html-test/ref/TH.html
index f142479c..74c2d60f 100644
--- a/html-test/ref/TH.html
+++ b/html-test/ref/TH.html
@@ -47,9 +47,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TH.html&quot;);};
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:decl" class="def"
+	  ><a id="v:decl" class="def"
 	    >decl</a
-	    > :: Q [Dec]</p
+	    > :: Q [Dec] <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	></div
       ></div
diff --git a/html-test/ref/TH2.html b/html-test/ref/TH2.html
index 07b2c7d4..024574a1 100644
--- a/html-test/ref/TH2.html
+++ b/html-test/ref/TH2.html
@@ -47,9 +47,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TH2.html&quot;);}
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f" class="def"
+	  ><a id="v:f" class="def"
 	    >f</a
-	    > :: t -&gt; t</p
+	    > :: t -&gt; t <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	></div
       ></div
diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index 6fb34801..4cb434ad 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -640,9 +640,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:T" class="def"
+	    > <a id="t:T" class="def"
 	    >T</a
-	    > a b</p
+	    > a b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >This comment applies to the <em
@@ -656,7 +658,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:A" class="def"
+		><a id="v:A" class="def"
 		  >A</a
 		  > <a href="#"
 		  >Int</a
@@ -676,7 +678,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:B" class="def"
+		><a id="v:B" class="def"
 		  >B</a
 		  > (<a href="#"
 		  >T</a
@@ -703,9 +705,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:T2" class="def"
+	    > <a id="t:T2" class="def"
 	    >T2</a
-	    > a b</p
+	    > a b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >An abstract data declaration</p
@@ -715,9 +719,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:T3" class="def"
+	    > <a id="t:T3" class="def"
 	    >T3</a
-	    > a b</p
+	    > a b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >A data declaration with no documentation annotations on the constructors</p
@@ -728,7 +734,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:A1" class="def"
+		><a id="v:A1" class="def"
 		  >A1</a
 		  > a</td
 		><td class="doc empty"
@@ -736,7 +742,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:B1" class="def"
+		><a id="v:B1" class="def"
 		  >B1</a
 		  > b</td
 		><td class="doc empty"
@@ -749,16 +755,18 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:T4" class="def"
+	    > <a id="t:T4" class="def"
 	    >T4</a
-	    > a b</p
+	    > a b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
 	    >Constructors</p
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:A2" class="def"
+		><a id="v:A2" class="def"
 		  >A2</a
 		  > a</td
 		><td class="doc empty"
@@ -766,7 +774,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:B2" class="def"
+		><a id="v:B2" class="def"
 		  >B2</a
 		  > b</td
 		><td class="doc empty"
@@ -779,16 +787,18 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:T5" class="def"
+	    > <a id="t:T5" class="def"
 	    >T5</a
-	    > a b</p
+	    > a b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
 	    >Constructors</p
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:A3" class="def"
+		><a id="v:A3" class="def"
 		  >A3</a
 		  > a</td
 		><td class="doc"
@@ -802,7 +812,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:B3" class="def"
+		><a id="v:B3" class="def"
 		  >B3</a
 		  > b</td
 		><td class="doc"
@@ -821,8 +831,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:T6" class="def"
+	    > <a id="t:T6" class="def"
 	    >T6</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -834,7 +846,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:A4" class="def"
+		><a id="v:A4" class="def"
 		  >A4</a
 		  ></td
 		><td class="doc"
@@ -848,7 +860,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:B4" class="def"
+		><a id="v:B4" class="def"
 		  >B4</a
 		  ></td
 		><td class="doc"
@@ -862,7 +874,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:C4" class="def"
+		><a id="v:C4" class="def"
 		  >C4</a
 		  ></td
 		><td class="doc"
@@ -881,9 +893,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="#" id="t:N1" class="def"
+	    > <a id="t:N1" class="def"
 	    >N1</a
-	    > a</p
+	    > a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >A newtype</p
@@ -894,7 +908,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:N1" class="def"
+		><a id="v:N1" class="def"
 		  >N1</a
 		  > a</td
 		><td class="doc empty"
@@ -907,9 +921,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="#" id="t:N2" class="def"
+	    > <a id="t:N2" class="def"
 	    >N2</a
-	    > a b</p
+	    > a b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >A newtype with a fieldname</p
@@ -920,7 +936,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:N2" class="def"
+		><a id="v:N2" class="def"
 		  >N2</a
 		  ></td
 		><td class="doc empty"
@@ -934,7 +950,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:n" class="def"
+			><a id="v:n" class="def"
 			  >n</a
 			  > :: a b</dfn
 			><div class="doc empty"
@@ -951,9 +967,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="#" id="t:N3" class="def"
+	    > <a id="t:N3" class="def"
 	    >N3</a
-	    > a b</p
+	    > a b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >A newtype with a fieldname, documentation on the field</p
@@ -964,7 +982,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:N3" class="def"
+		><a id="v:N3" class="def"
 		  >N3</a
 		  ></td
 		><td class="doc empty"
@@ -978,7 +996,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:n3" class="def"
+			><a id="v:n3" class="def"
 			  >n3</a
 			  > :: a b</dfn
 			><div class="doc"
@@ -1001,9 +1019,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:N4" class="def"
+	    > <a id="t:N4" class="def"
 	    >N4</a
-	    > a b</p
+	    > a b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >An abstract newtype - we show this one as data rather than newtype because
@@ -1014,16 +1034,18 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="#" id="t:N5" class="def"
+	    > <a id="t:N5" class="def"
 	    >N5</a
-	    > a b</p
+	    > a b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
 	    >Constructors</p
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:N5" class="def"
+		><a id="v:N5" class="def"
 		  >N5</a
 		  ></td
 		><td class="doc empty"
@@ -1037,7 +1059,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:n5" class="def"
+			><a id="v:n5" class="def"
 			  >n5</a
 			  > :: a b</dfn
 			><div class="doc"
@@ -1056,16 +1078,18 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="#" id="t:N6" class="def"
+	    > <a id="t:N6" class="def"
 	    >N6</a
-	    > a b</p
+	    > a b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
 	    >Constructors</p
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:N6" class="def"
+		><a id="v:N6" class="def"
 		  >N6</a
 		  ></td
 		><td class="doc"
@@ -1081,7 +1105,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:n6" class="def"
+			><a id="v:n6" class="def"
 			  >n6</a
 			  > :: a b</dfn
 			><div class="doc empty"
@@ -1098,9 +1122,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="#" id="t:N7" class="def"
+	    > <a id="t:N7" class="def"
 	    >N7</a
-	    > a b</p
+	    > a b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >docs on the newtype and the constructor</p
@@ -1111,7 +1137,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:N7" class="def"
+		><a id="v:N7" class="def"
 		  >N7</a
 		  ></td
 		><td class="doc"
@@ -1131,7 +1157,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:n7" class="def"
+			><a id="v:n7" class="def"
 			  >n7</a
 			  > :: a b</dfn
 			><div class="doc empty"
@@ -1150,8 +1176,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:R" class="def"
+	    > <a id="t:R" class="def"
 	    >R</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -1184,7 +1212,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:C1" class="def"
+		><a id="v:C1" class="def"
 		  >C1</a
 		  ></td
 		><td class="doc"
@@ -1204,7 +1232,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:p" class="def"
+			><a id="v:p" class="def"
 			  >p</a
 			  > :: <a href="#"
 			  >Int</a
@@ -1220,7 +1248,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="#" id="v:q" class="def"
+			><a id="v:q" class="def"
 			  >q</a
 			  > :: <span class="keyword"
 			  >forall</span
@@ -1236,9 +1264,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="#" id="v:r" class="def"
+			><a id="v:r" class="def"
 			  >r</a
-			  >, <a href="#" id="v:s" class="def"
+			  >, <a id="v:s" class="def"
 			  >s</a
 			  > :: <a href="#"
 			  >Int</a
@@ -1262,7 +1290,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:C2" class="def"
+		><a id="v:C2" class="def"
 		  >C2</a
 		  ></td
 		><td class="doc"
@@ -1282,7 +1310,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:t" class="def"
+			><a id="v:t" class="def"
 			  >t</a
 			  > :: T1 -&gt; <a href="#"
 			  >T2</a
@@ -1310,9 +1338,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="#" id="v:u" class="def"
+			><a id="v:u" class="def"
 			  >u</a
-			  >, <a href="#" id="v:v" class="def"
+			  >, <a id="v:v" class="def"
 			  >v</a
 			  > :: <a href="#"
 			  >Int</a
@@ -1331,8 +1359,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:R1" class="def"
+	    > <a id="t:R1" class="def"
 	    >R1</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -1344,7 +1374,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:C3" class="def"
+		><a id="v:C3" class="def"
 		  >C3</a
 		  ></td
 		><td class="doc"
@@ -1364,7 +1394,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:s1" class="def"
+			><a id="v:s1" class="def"
 			  >s1</a
 			  > :: <a href="#"
 			  >Int</a
@@ -1380,7 +1410,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="#" id="v:s2" class="def"
+			><a id="v:s2" class="def"
 			  >s2</a
 			  > :: <a href="#"
 			  >Int</a
@@ -1396,7 +1426,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 			></li
 		      ><li
 		      ><dfn class="src"
-			><a href="#" id="v:s3" class="def"
+			><a id="v:s3" class="def"
 			  >s3</a
 			  > :: <a href="#"
 			  >Int</a
@@ -1429,10 +1459,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	    >class</span
 	    > <a href="#"
 	    >D</a
-	    > a =&gt; <a href="#" id="t:C" class="def"
+	    > a =&gt; <a id="t:C" class="def"
 	    >C</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -1458,11 +1490,13 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:a" class="def"
+	    ><a id="v:a" class="def"
 	      >a</a
 	      > :: <a href="#"
 	      >IO</a
-	      > a</p
+	      > a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><div class="doc"
 	    ><p
 	      >this is a description of the <code
@@ -1472,9 +1506,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		> method</p
 	      ></div
 	    ><p class="src"
-	    ><a href="#" id="v:b" class="def"
+	    ><a id="v:b" class="def"
 	      >b</a
-	      > :: [a]</p
+	      > :: [a] <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><div class="doc"
 	    ><p
 	      >this is a description of the <code
@@ -1489,10 +1525,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:D" class="def"
+	    > <a id="t:D" class="def"
 	    >D</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -1512,15 +1550,19 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:d" class="def"
+	    ><a id="v:d" class="def"
 	      >d</a
 	      > :: <a href="#"
 	      >T</a
-	      > a b</p
+	      > a b <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><p class="src"
-	    ><a href="#" id="v:e" class="def"
+	    ><a id="v:e" class="def"
 	      >e</a
-	      > :: (a, a)</p
+	      > :: (a, a) <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ><div class="subs instances"
 	  ><p id="control.i:D" class="caption collapser" onclick="toggleSection('i:D')"
@@ -1537,6 +1579,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		      > <a href="#"
 		      >Float</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1554,7 +1598,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 			  >T</a
 			  > <a href="#"
 			  >Float</a
-			  > b</p
+			  > b <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >e</a
@@ -1562,7 +1608,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 			  >Float</a
 			  >, <a href="#"
 			  >Float</a
-			  >)</p
+			  >) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -1577,6 +1625,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 		      > <a href="#"
 		      >Int</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1594,7 +1644,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 			  >T</a
 			  > <a href="#"
 			  >Int</a
-			  > b</p
+			  > b <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			><p class="src"
 			><a href="#"
 			  >e</a
@@ -1602,7 +1654,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 			  >Int</a
 			  >, <a href="#"
 			  >Int</a
-			  >)</p
+			  >) <a href="#" class="selflink"
+			  >#</a
+			  ></p
 			></div
 		      ></div
 		    ></td
@@ -1615,9 +1669,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:E" class="def"
+	    > <a id="t:E" class="def"
 	    >E</a
-	    > a</p
+	    > a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >This is a class declaration with no methods (or no methods exported)</p
@@ -1633,10 +1689,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:F" class="def"
+	    > <a id="t:F" class="def"
 	    >F</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs minimal"
 	  ><p class="caption"
@@ -1650,9 +1708,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:ff" class="def"
+	    ><a id="v:ff" class="def"
 	      >ff</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ></div
 	  ></div
 	><div class="doc"
@@ -1661,13 +1721,15 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:a" class="def"
+	  ><a id="v:a" class="def"
 	    >a</a
 	    > :: <a href="#"
 	    >C</a
 	    > a =&gt; <a href="#"
 	    >IO</a
-	    > a</p
+	    > a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >this is a description of the <code
@@ -1681,12 +1743,14 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Test.html&quot;);
 	>Function types</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f" class="def"
+	  ><a id="v:f" class="def"
 	    >f</a
 	    > :: <a href="#"
 	    >C</a
 	    > a =&gt; a -&gt; <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -1743,13 +1807,15 @@ using double quotes: <a href="#"
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:g" class="def"
+	  ><a id="v:g" class="def"
 	    >g</a
 	    > :: <a href="#"
 	    >Int</a
 	    > -&gt; <a href="#"
 	    >IO</a
-	    > CInt</p
+	    > CInt <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >we can export foreign declarations too</p
@@ -1840,12 +1906,14 @@ 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 id="v:hidden" class="def"
 	    >hidden</a
 	    > :: <a href="#"
 	    >Int</a
 	    > -&gt; <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	><h1 id="g:8"
@@ -1866,9 +1934,11 @@ is at the beginning of the line).</pre
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Ex" class="def"
+	    > <a id="t:Ex" class="def"
 	    >Ex</a
-	    > a</p
+	    > a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >A data-type using existential/universal types</p
@@ -1881,7 +1951,7 @@ is at the beginning of the line).</pre
 	      ><td class="src"
 		><a href="#"
 		  >C</a
-		  > b =&gt; <a href="#" id="v:Ex1" class="def"
+		  > b =&gt; <a id="v:Ex1" class="def"
 		  >Ex1</a
 		  > b</td
 		><td class="doc empty"
@@ -1889,7 +1959,7 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:Ex2" class="def"
+		><a id="v:Ex2" class="def"
 		  >Ex2</a
 		  > b</td
 		><td class="doc empty"
@@ -1899,7 +1969,7 @@ is at the beginning of the line).</pre
 	      ><td class="src"
 		><a href="#"
 		  >C</a
-		  > a =&gt; <a href="#" id="v:Ex3" class="def"
+		  > a =&gt; <a id="v:Ex3" class="def"
 		  >Ex3</a
 		  > b</td
 		><td class="doc empty"
@@ -1907,7 +1977,7 @@ is at the beginning of the line).</pre
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:Ex4" class="def"
+		><a id="v:Ex4" class="def"
 		  >Ex4</a
 		  > (<span class="keyword"
 		  >forall</span
@@ -1922,8 +1992,10 @@ 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 id="v:k" class="def"
 	    >k</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs arguments"
 	  ><p class="caption"
@@ -2010,8 +2082,10 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:l" class="def"
+	  ><a id="v:l" class="def"
 	    >l</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs arguments"
 	  ><p class="caption"
@@ -2050,8 +2124,10 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:m" class="def"
+	  ><a id="v:m" class="def"
 	    >m</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs arguments"
 	  ><p class="caption"
@@ -2096,8 +2172,10 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:o" class="def"
+	  ><a id="v:o" class="def"
 	    >o</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs arguments"
 	  ><p class="caption"
@@ -2146,10 +2224,12 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f-39-" class="def"
+	  ><a id="v:f-39-" class="def"
 	    >f'</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -2163,10 +2243,12 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:withType" class="def"
+	  ><a id="v:withType" class="def"
 	    >withType</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -2175,9 +2257,11 @@ is at the beginning of the line).</pre
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:withoutType" class="def"
+	  ><a id="v:withoutType" class="def"
 	    >withoutType</a
-	    > :: a</p
+	    > :: a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Comment on a definition without type signature</p
diff --git a/html-test/ref/Threaded.html b/html-test/ref/Threaded.html
index 7aacfb60..8c2261b1 100644
--- a/html-test/ref/Threaded.html
+++ b/html-test/ref/Threaded.html
@@ -69,10 +69,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Threaded.html&quo
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f" class="def"
+	  ><a id="v:f" class="def"
 	    >f</a
 	    > :: <a href="#"
 	    >Integer</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/Threaded_TH.html b/html-test/ref/Threaded_TH.html
index ca191bd6..2140d5b7 100644
--- a/html-test/ref/Threaded_TH.html
+++ b/html-test/ref/Threaded_TH.html
@@ -68,9 +68,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Threaded_TH.html&
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:forkTH" class="def"
+	  ><a id="v:forkTH" class="def"
 	    >forkTH</a
-	    > :: Q Exp</p
+	    > :: Q Exp <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >forkOS requires the threaded RTS, so this TH fails if haddock was
diff --git a/html-test/ref/Ticket112.html b/html-test/ref/Ticket112.html
index 42e9cf13..6f42cff6 100644
--- a/html-test/ref/Ticket112.html
+++ b/html-test/ref/Ticket112.html
@@ -57,9 +57,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Ticket112.html&qu
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f" class="def"
+	  ><a id="v:f" class="def"
 	    >f</a
-	    > :: a</p
+	    > :: a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >...given a raw <code
diff --git a/html-test/ref/Ticket61.html b/html-test/ref/Ticket61.html
index cb6ee3d7..e4ff49be 100644
--- a/html-test/ref/Ticket61.html
+++ b/html-test/ref/Ticket61.html
@@ -49,10 +49,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Ticket61.html&quo
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:C" class="def"
+	    > <a id="t:C" class="def"
 	    >C</a
 	    > a <span class="keyword"
 	    >where</span
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="subs minimal"
 	  ><p class="caption"
@@ -66,9 +68,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Ticket61.html&quo
 	  ><p class="caption"
 	    >Methods</p
 	    ><p class="src"
-	    ><a href="#" id="v:f" class="def"
+	    ><a id="v:f" class="def"
 	      >f</a
-	      > :: a</p
+	      > :: a <a href="#" class="selflink"
+	      >#</a
+	      ></p
 	    ><div class="doc"
 	    ><p
 	      >A comment about f</p
diff --git a/html-test/ref/Ticket75.html b/html-test/ref/Ticket75.html
index 948453cf..79678466 100644
--- a/html-test/ref/Ticket75.html
+++ b/html-test/ref/Ticket75.html
@@ -69,16 +69,18 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Ticket75.html&quo
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a href="#" id="t::-45-" class="def"
+	    > a <a id="t::-45-" class="def"
 	    >:-</a
-	    > b</p
+	    > b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
 	    >Constructors</p
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:Q" class="def"
+		><a id="v:Q" class="def"
 		  >Q</a
 		  ></td
 		><td class="doc empty"
@@ -89,10 +91,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Ticket75.html&quo
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f" class="def"
+	  ><a id="v:f" class="def"
 	    >f</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/TitledPicture.html b/html-test/ref/TitledPicture.html
index 1b0cc539..61170750 100644
--- a/html-test/ref/TitledPicture.html
+++ b/html-test/ref/TitledPicture.html
@@ -65,10 +65,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TitledPicture.htm
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:foo" class="def"
+	  ><a id="v:foo" class="def"
 	    >foo</a
 	    > :: <a href="#"
 	    >Integer</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -82,10 +84,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TitledPicture.htm
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:bar" class="def"
+	  ><a id="v:bar" class="def"
 	    >bar</a
 	    > :: <a href="#"
 	    >Integer</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index a55a55ad..f96ad89e 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -169,8 +169,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:X" class="def"
+	    > <a id="t:X" class="def"
 	    >X</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -182,7 +184,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:X" class="def"
+		><a id="v:X" class="def"
 		  >X</a
 		  ></td
 		><td class="doc"
@@ -192,7 +194,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:XX" class="def"
+		><a id="v:XX" class="def"
 		  >XX</a
 		  ></td
 		><td class="doc"
@@ -202,7 +204,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:XXX" class="def"
+		><a id="v:XXX" class="def"
 		  >XXX</a
 		  ></td
 		><td class="doc"
@@ -231,6 +233,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > <a href="#"
 		      >XXX</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -253,6 +257,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > <a href="#"
 		      >X</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -276,6 +282,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 			  >X</a
 			  >) :: <a href="#"
 			  >*</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><span class="keyword"
@@ -288,6 +296,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 			  >X</a
 			  >) :: <a href="#"
 			  >*</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			></div
 		      ></div
@@ -305,6 +315,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > <a href="#"
 		      >X</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -329,6 +341,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > = <a href="#"
 		      >Y</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -349,6 +363,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > = <a href="#"
 		      >X</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -364,9 +380,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      >*</a
 		      > <a href="#"
 		      >X</a
-		      > = <a href="#" id="v:AssocX" class="def"
+		      > = <a id="v:AssocX" class="def"
 		      >AssocX</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -389,6 +407,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > <a href="#"
 		      >X</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -406,23 +426,23 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      >X</a
 		      > <ul class="inst"
 		      ><li class="inst"
-			>= <a href="#" id="v:BatX" class="def"
+			>= <a id="v:BatX" class="def"
 			  >BatX</a
 			  > <a href="#"
 			  >X</a
 			  ></li
 			><li class="inst"
-			>| <a href="#" id="v:BatXX" class="def"
+			>| <a id="v:BatXX" class="def"
 			  >BatXX</a
 			  > { <ul class="subs"
 			  ><li
-			    ><a href="#" id="v:aaa" class="def"
+			    ><a id="v:aaa" class="def"
 			      >aaa</a
 			      > :: <a href="#"
 			      >X</a
 			      ></li
 			    ><li
-			    ><a href="#" id="v:bbb" class="def"
+			    ><a id="v:bbb" class="def"
 			      >bbb</a
 			      > :: <a href="#"
 			      >Y</a
@@ -431,6 +451,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 			  > }</li
 			></ul
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -451,6 +473,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > = <a href="#"
 		      >Y</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -469,6 +493,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > a = <a href="#"
 		      >X</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -481,8 +507,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Y" class="def"
+	    > <a id="t:Y" class="def"
 	    >Y</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -505,6 +533,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > <a href="#"
 		      >Y</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -528,6 +558,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 			  >Y</a
 			  >) :: <a href="#"
 			  >*</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><span class="keyword"
@@ -540,6 +572,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 			  >Y</a
 			  >) :: <a href="#"
 			  >*</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			></div
 		      ></div
@@ -557,6 +591,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > <a href="#"
 		      >Y</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -579,6 +615,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > <a href="#"
 		      >Y</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -594,9 +632,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      >*</a
 		      > <a href="#"
 		      >Y</a
-		      > = <a href="#" id="v:AssocY" class="def"
+		      > = <a id="v:AssocY" class="def"
 		      >AssocY</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -619,6 +659,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > <a href="#"
 		      >Y</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -634,11 +676,13 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      >*</a
 		      > <a href="#"
 		      >Y</a
-		      > = <a href="#" id="v:BatY" class="def"
+		      > = <a id="v:BatY" class="def"
 		      >BatY</a
 		      > <a href="#"
 		      >Y</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -659,6 +703,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > = <a href="#"
 		      >X</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -675,6 +721,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > <a href="#"
 		      >Y</a
 		      > a = a</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -687,8 +735,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Z" class="def"
+	    > <a id="t:Z" class="def"
 	    >Z</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -700,7 +750,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:ZA" class="def"
+		><a id="v:ZA" class="def"
 		  >ZA</a
 		  ></td
 		><td class="doc empty"
@@ -708,7 +758,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		></tr
 	      ><tr
 	      ><td class="src"
-		><a href="#" id="v:ZB" class="def"
+		><a id="v:ZB" class="def"
 		  >ZB</a
 		  ></td
 		><td class="doc empty"
@@ -734,7 +784,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      >where</span
 		      ><ul class="inst"
 		      ><li class="inst"
-			><a href="#" id="v:BatZ1" class="def"
+			><a id="v:BatZ1" class="def"
 			  >BatZ1</a
 			  > :: <a href="#"
 			  >Bat</a
@@ -744,7 +794,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 			  >ZA</a
 			  ></li
 			><li class="inst"
-			><a href="#" id="v:BatZ2" class="def"
+			><a id="v:BatZ2" class="def"
 			  >BatZ2</a
 			  > :: <a href="#"
 			  >Bat</a
@@ -755,6 +805,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 			  ></li
 			></ul
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -769,9 +821,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:Test" class="def"
+	    > <a id="t:Test" class="def"
 	    >Test</a
-	    > a</p
+	    > a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Doc for: class Test a</p
@@ -793,6 +847,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > <a href="#"
 		      >Y</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -817,6 +873,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > <a href="#"
 		      >X</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -837,9 +895,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > <a href="#" id="t:Foo" class="def"
+	    > <a id="t:Foo" class="def"
 	    >Foo</a
-	    > a :: k</p
+	    > a :: k <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Doc for: type family Foo a</p
@@ -863,6 +923,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > = <a href="#"
 		      >X</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -881,6 +943,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > = <a href="#"
 		      >Y</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -893,10 +957,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a href="#" id="t:Bat" class="def"
+	    > <a id="t:Bat" class="def"
 	    >Bat</a
 	    > a :: <a href="#"
 	    >*</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -920,7 +986,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      >where</span
 		      ><ul class="inst"
 		      ><li class="inst"
-			><a href="#" id="v:BatZ1" class="def"
+			><a id="v:BatZ1" class="def"
 			  >BatZ1</a
 			  > :: <a href="#"
 			  >Bat</a
@@ -930,7 +996,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 			  >ZA</a
 			  ></li
 			><li class="inst"
-			><a href="#" id="v:BatZ2" class="def"
+			><a id="v:BatZ2" class="def"
 			  >BatZ2</a
 			  > :: <a href="#"
 			  >Bat</a
@@ -941,6 +1007,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 			  ></li
 			></ul
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -958,11 +1026,13 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      >*</a
 		      > <a href="#"
 		      >Y</a
-		      > = <a href="#" id="v:BatY" class="def"
+		      > = <a id="v:BatY" class="def"
 		      >BatY</a
 		      > <a href="#"
 		      >Y</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -982,23 +1052,23 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      >X</a
 		      > <ul class="inst"
 		      ><li class="inst"
-			>= <a href="#" id="v:BatX" class="def"
+			>= <a id="v:BatX" class="def"
 			  >BatX</a
 			  > <a href="#"
 			  >X</a
 			  ></li
 			><li class="inst"
-			>| <a href="#" id="v:BatXX" class="def"
+			>| <a id="v:BatXX" class="def"
 			  >BatXX</a
 			  > { <ul class="subs"
 			  ><li
-			    ><a href="#" id="v:aaa" class="def"
+			    ><a id="v:aaa" class="def"
 			      >aaa</a
 			      > :: <a href="#"
 			      >X</a
 			      ></li
 			    ><li
-			    ><a href="#" id="v:bbb" class="def"
+			    ><a id="v:bbb" class="def"
 			      >bbb</a
 			      > :: <a href="#"
 			      >Y</a
@@ -1007,6 +1077,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 			  > }</li
 			></ul
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -1021,9 +1093,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > <a href="#" id="t:Assoc" class="def"
+	    > <a id="t:Assoc" class="def"
 	    >Assoc</a
-	    > a</p
+	    > a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Doc for: class Assoc a</p
@@ -1034,10 +1108,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 	    ><p class="src"
 	    ><span class="keyword"
 	      >data</span
-	      > <a href="#" id="t:AssocD" class="def"
+	      > <a id="t:AssocD" class="def"
 	      >AssocD</a
 	      > a :: <a href="#"
 	      >*</a
+	      > <a href="#" class="selflink"
+	      >#</a
 	      ></p
 	    ><div class="doc"
 	    ><p
@@ -1046,10 +1122,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 	    ><p class="src"
 	    ><span class="keyword"
 	      >type</span
-	      > <a href="#" id="t:AssocT" class="def"
+	      > <a id="t:AssocT" class="def"
 	      >AssocT</a
 	      > a :: <a href="#"
 	      >*</a
+	      > <a href="#" class="selflink"
+	      >#</a
 	      ></p
 	    ><div class="doc"
 	    ><p
@@ -1073,6 +1151,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > <a href="#"
 		      >Y</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -1096,6 +1176,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 			  >Y</a
 			  >) :: <a href="#"
 			  >*</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><span class="keyword"
@@ -1108,6 +1190,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 			  >Y</a
 			  >) :: <a href="#"
 			  >*</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			></div
 		      ></div
@@ -1125,6 +1209,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > <a href="#"
 		      >X</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -1148,6 +1234,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 			  >X</a
 			  >) :: <a href="#"
 			  >*</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			><p class="src"
 			><span class="keyword"
@@ -1160,6 +1248,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 			  >X</a
 			  >) :: <a href="#"
 			  >*</a
+			  > <a href="#" class="selflink"
+			  >#</a
 			  ></p
 			></div
 		      ></div
@@ -1173,9 +1263,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > <a href="#" id="t:Bar" class="def"
+	    > <a id="t:Bar" class="def"
 	    >Bar</a
-	    > b</p
+	    > b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Doc for: type family Bar b</p
@@ -1213,9 +1305,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > a <a href="#" id="t:-60--62-" class="def"
+	    > a <a id="t:-60--62-" class="def"
 	    >&lt;&gt;</a
-	    > b :: k</p
+	    > b :: k <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="subs instances"
 	  ><p id="control.i:-60--62-" class="caption collapser" onclick="toggleSection('i:-60--62-')"
 	    >Instances</p
@@ -1237,6 +1331,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > = <a href="#"
 		      >X</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1253,6 +1349,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > <a href="#"
 		      >Y</a
 		      > a = a</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1271,6 +1369,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > a = <a href="#"
 		      >X</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -1283,9 +1383,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > a <a href="#" id="t:-62--60-" class="def"
+	    > a <a id="t:-62--60-" class="def"
 	    >&gt;&lt;</a
-	    > b</p
+	    > b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="subs instances"
 	  ><p id="control.i:-62--60-" class="caption collapser" onclick="toggleSection('i:-62--60-')"
 	    >Instances</p
@@ -1305,6 +1407,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies.html
 		      > <a href="#"
 		      >XXX</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
diff --git a/html-test/ref/TypeFamilies2.html b/html-test/ref/TypeFamilies2.html
index dae60489..0da8e6c9 100644
--- a/html-test/ref/TypeFamilies2.html
+++ b/html-test/ref/TypeFamilies2.html
@@ -73,8 +73,10 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies2.htm
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:W" class="def"
+	    > <a id="t:W" class="def"
 	    >W</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
@@ -94,9 +96,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies2.htm
 		      >Bar</a
 		      > <a href="#"
 		      >W</a
-		      > = <a href="#" id="v:BarX" class="def"
+		      > = <a id="v:BarX" class="def"
 		      >BarX</a
 		      > Z</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -113,6 +117,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies2.htm
 		      > <a href="#"
 		      >W</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -125,9 +131,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies2.htm
 	><p class="src"
 	  ><span class="keyword"
 	    >type family</span
-	    > <a href="#" id="t:Foo" class="def"
+	    > <a id="t:Foo" class="def"
 	    >Foo</a
-	    > a</p
+	    > a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Exported type family</p
@@ -147,6 +155,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies2.htm
 		      > <a href="#"
 		      >W</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -163,6 +173,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies2.htm
 		      > = <a href="#"
 		      >Y</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
@@ -175,9 +187,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies2.htm
 	><p class="src"
 	  ><span class="keyword"
 	    >data family</span
-	    > <a href="#" id="t:Bar" class="def"
+	    > <a id="t:Bar" class="def"
 	    >Bar</a
-	    > a</p
+	    > a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="doc"
 	  ><p
 	    >Exported data family</p
@@ -196,9 +210,11 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies2.htm
 		      >Bar</a
 		      > <a href="#"
 		      >W</a
-		      > = <a href="#" id="v:BarX" class="def"
+		      > = <a id="v:BarX" class="def"
 		      >BarX</a
 		      > Z</span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc"
 		  ><p
@@ -215,6 +231,8 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeFamilies2.htm
 		      > <a href="#"
 		      >Y</a
 		      ></span
+		    > <a href="#" class="selflink"
+		    >#</a
 		    ></td
 		  ><td class="doc empty"
 		  ></td
diff --git a/html-test/ref/TypeOperators.html b/html-test/ref/TypeOperators.html
index a6521437..f6da47b1 100644
--- a/html-test/ref/TypeOperators.html
+++ b/html-test/ref/TypeOperators.html
@@ -49,40 +49,48 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeOperators.htm
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > a <a href="#" id="t::-45-:" class="def"
+	    > a <a id="t::-45-:" class="def"
 	    >:-:</a
-	    > b</p
+	    > b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > (a <a href="#" id="t::-43-:" class="def"
+	    > (a <a id="t::-43-:" class="def"
 	    >:+:</a
-	    > b) c</p
+	    > b) c <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
 	    >data</span
-	    > <a href="#" id="t:Op" class="def"
+	    > <a id="t:Op" class="def"
 	    >Op</a
-	    > a b</p
+	    > a b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
 	  ><span class="keyword"
 	    >newtype</span
-	    > <a href="#" id="t:O" class="def"
+	    > <a id="t:O" class="def"
 	    >O</a
-	    > g f a</p
+	    > g f a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ><div class="subs constructors"
 	  ><p class="caption"
 	    >Constructors</p
 	    ><table
 	    ><tr
 	      ><td class="src"
-		><a href="#" id="v:O" class="def"
+		><a id="v:O" class="def"
 		  >O</a
 		  ></td
 		><td class="doc empty"
@@ -96,7 +104,7 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeOperators.htm
 		    ><ul
 		    ><li
 		      ><dfn class="src"
-			><a href="#" id="v:unO" class="def"
+			><a id="v:unO" class="def"
 			  >unO</a
 			  > :: g (f a)</dfn
 			><div class="doc empty"
@@ -113,33 +121,41 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeOperators.htm
 	><p class="src"
 	  ><span class="keyword"
 	    >class</span
-	    > a <a href="#" id="t:-60--61--62-" class="def"
+	    > a <a id="t:-60--61--62-" class="def"
 	    >&lt;=&gt;</a
-	    > b</p
+	    > b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:biO" class="def"
+	  ><a id="v:biO" class="def"
 	    >biO</a
 	    > :: (g <a href="#"
 	    >`O`</a
-	    > f) a</p
+	    > f) a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:f" class="def"
+	  ><a id="v:f" class="def"
 	    >f</a
-	    > :: a ~ b =&gt; a -&gt; b</p
+	    > :: a ~ b =&gt; a -&gt; b <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:g" class="def"
+	  ><a id="v:g" class="def"
 	    >g</a
-	    > :: (a ~ b, b ~ c) =&gt; a -&gt; c</p
+	    > :: (a ~ b, b ~ c) =&gt; a -&gt; c <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:x" class="def"
+	  ><a id="v:x" class="def"
 	    >x</a
 	    > :: (a <a href="#"
 	    >:-:</a
@@ -147,11 +163,13 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeOperators.htm
 	    >&lt;=&gt;</a
 	    > (a <a href="#"
 	    >`Op`</a
-	    > a) =&gt; a</p
+	    > a) =&gt; a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:y" class="def"
+	  ><a id="v:y" class="def"
 	    >y</a
 	    > :: (a <a href="#"
 	    >&lt;=&gt;</a
@@ -159,7 +177,9 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_TypeOperators.htm
 	    >`Op`</a
 	    > a) <a href="#"
 	    >&lt;=&gt;</a
-	    > a) =&gt; a</p
+	    > a) =&gt; a <a href="#" class="selflink"
+	    >#</a
+	    ></p
 	  ></div
 	></div
       ></div
diff --git a/html-test/ref/Unicode.html b/html-test/ref/Unicode.html
index 393973d5..335761f2 100644
--- a/html-test/ref/Unicode.html
+++ b/html-test/ref/Unicode.html
@@ -59,10 +59,12 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Unicode.html&quot
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:x" class="def"
+	  ><a id="v:x" class="def"
 	    >x</a
 	    > :: <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ><div class="doc"
 	  ><p
diff --git a/html-test/ref/Visible.html b/html-test/ref/Visible.html
index 755eb9cd..f1390568 100644
--- a/html-test/ref/Visible.html
+++ b/html-test/ref/Visible.html
@@ -47,12 +47,14 @@ window.onload = function () {pageLoad();setSynopsis(&quot;mini_Visible.html&quot
 	>Documentation</h1
 	><div class="top"
 	><p class="src"
-	  ><a href="#" id="v:visible" class="def"
+	  ><a id="v:visible" class="def"
 	    >visible</a
 	    > :: <a href="#"
 	    >Int</a
 	    > -&gt; <a href="#"
 	    >Int</a
+	    > <a href="#" class="selflink"
+	    >#</a
 	    ></p
 	  ></div
 	></div
diff --git a/html-test/ref/ocean.css b/html-test/ref/ocean.css
index 428040bc..fcf23810 100644
--- a/html-test/ref/ocean.css
+++ b/html-test/ref/ocean.css
@@ -159,6 +159,8 @@ p.caption.expander {
 .instance.collapser, .instance.expander {
   margin-left: 0px;
   background-position: left center;
+  min-width: 9px;
+  min-height: 9px;
 }
 
 
@@ -379,21 +381,16 @@ div#style-menu-holder {
 #interface h5 + div.top {
  	margin-top: 1em;
 }
-#interface p.src .link {
+#interface .src .selflink,
+#interface .src .link {
   float: right;
   color: #919191;
-  border-left: 1px solid #919191;
   background: #f0f0f0;
   padding: 0 0.5em 0.2em;
-  margin: 0 -0.5em 0 0.5em;
+  margin: 0 -0.5em 0 0;
 }
-
-#interface td.src .link {
-  float: right;
-  color: #919191;
+#interface .src .selflink {
   border-left: 1px solid #919191;
-  background: #f0f0f0;
-  padding: 0 0.5em 0.2em;
   margin: 0 -0.5em 0 0.5em;
 }