diff --git a/html-test/ref/A.html b/html-test/ref/A.html
index 537a7bacb7fce0fc8a78bd0e63846e1201828e69..9e41e1549b058170f2e8a24d97da91693b3fe6ce 100644
--- a/html-test/ref/A.html
+++ b/html-test/ref/A.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -182,4 +182,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/B.html b/html-test/ref/B.html
index 1d7d436c302ce0106b32f17b8d6bb007217bcff2..9c2a9c83040ae63a63914a774ac07eab7bc69236 100644
--- a/html-test/ref/B.html
+++ b/html-test/ref/B.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
@@ -170,4 +170,4 @@
     ></div
     ></body
   ></html
->
+>
\ No newline at end of file
diff --git a/html-test/ref/Bold.html b/html-test/ref/Bold.html
index 276e7b23fbe771fd417c24772c75af2c45b70619..9c684aa5238b525194a4994213f2dae02f7585ac 100644
--- a/html-test/ref/Bold.html
+++ b/html-test/ref/Bold.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug1.html b/html-test/ref/Bug1.html
index 7c025ddf3af0bba78a0b4510e92759a54fe0f9fb..d17d3f49cbbd2ee996954a03fbfa9443ae60ed22 100644
--- a/html-test/ref/Bug1.html
+++ b/html-test/ref/Bug1.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug195.html b/html-test/ref/Bug195.html
index dd6fe2d915410574f382bf705454b80ff51f9a00..3049bf00b1dea8d86f632fa08b585ed0760e6853 100644
--- a/html-test/ref/Bug195.html
+++ b/html-test/ref/Bug195.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug2.html b/html-test/ref/Bug2.html
index e08e37eea93c4a90ffdf71eddfb5b7c0f0640790..8fe2da5d35203d1150997f39077ac39477ac6f12 100644
--- a/html-test/ref/Bug2.html
+++ b/html-test/ref/Bug2.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug201.html b/html-test/ref/Bug201.html
index 1db6e428c548ce78dde5bf654df491f2f4ff5a67..6db101c3c851e35a34b478d1e21629d255e567bf 100644
--- a/html-test/ref/Bug201.html
+++ b/html-test/ref/Bug201.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug253.html b/html-test/ref/Bug253.html
index 92a467c3de1a152e00c0c5d9b16fc0b7b544ffce..314feb5562d2e17467ef5303b35bbc52ae8015f3 100644
--- a/html-test/ref/Bug253.html
+++ b/html-test/ref/Bug253.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug26.html b/html-test/ref/Bug26.html
index 3593fca3c5df5b3583cee0f7a93b170838e879c4..76645bd2adecb669c0a34fce8fce46ea46eef631 100644
--- a/html-test/ref/Bug26.html
+++ b/html-test/ref/Bug26.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug280.html b/html-test/ref/Bug280.html
index 84c79832d40cf239a033c2542e67ae695deff598..e480a9cbaed72e4f3c62575560f136cb41016517 100644
--- a/html-test/ref/Bug280.html
+++ b/html-test/ref/Bug280.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug294.html b/html-test/ref/Bug294.html
index 96bf092eb1ef51a095fa08de0420b7f4a209f11e..2a1159e43ce6aea2e86b8586762bdfd9a9a705ce 100644
--- a/html-test/ref/Bug294.html
+++ b/html-test/ref/Bug294.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug298.html b/html-test/ref/Bug298.html
index 4c9e108f9d3b101a0477719da080f900c24b352d..598d1943f2096e0e7c894a7138440c80bbfb793d 100644
--- a/html-test/ref/Bug298.html
+++ b/html-test/ref/Bug298.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug3.html b/html-test/ref/Bug3.html
index 274f663a05b1bbf15d52c4e10d0160aa19c0022a..bf55cee025bc7cd7c785a4031c478279d19d92f3 100644
--- a/html-test/ref/Bug3.html
+++ b/html-test/ref/Bug3.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug308.html b/html-test/ref/Bug308.html
index 055d10ba4fc02cab0baefc5475acf8a57e9391a1..168c3935526f5661ffd64817e2ecbbb4a3394ad1 100644
--- a/html-test/ref/Bug308.html
+++ b/html-test/ref/Bug308.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug308CrossModule.html b/html-test/ref/Bug308CrossModule.html
index 5e4cfcb47e221c6ecbaacea21e1642bb7a16161a..091e1d7466df45eee7b61015a568d3a3b49e4204 100644
--- a/html-test/ref/Bug308CrossModule.html
+++ b/html-test/ref/Bug308CrossModule.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug310.html b/html-test/ref/Bug310.html
index 61580eea49b1b15b9bd79719289830a1a22231d5..d1f65b08d19d18f5b1b15130601df15ffaf16ab4 100644
--- a/html-test/ref/Bug310.html
+++ b/html-test/ref/Bug310.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug313.html b/html-test/ref/Bug313.html
index 4059fd810aadcfb7e04fcc386ef4e4f93b7a2f0c..a4bc1d8e4086638ef1b7bae74c3272e39e91ec43 100644
--- a/html-test/ref/Bug313.html
+++ b/html-test/ref/Bug313.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug335.html b/html-test/ref/Bug335.html
index 759b4e0ffe9098b867922bb41fcc063f6f980766..2971ac059b25ee6dc5c6d925dd4108ad744a7288 100644
--- a/html-test/ref/Bug335.html
+++ b/html-test/ref/Bug335.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug387.html b/html-test/ref/Bug387.html
index 7af3814371ae9dbc87ab99ceb007c6473849473d..8f2c19f4d742c535badb0f3cf6b1e418b8d7fa6b 100644
--- a/html-test/ref/Bug387.html
+++ b/html-test/ref/Bug387.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug4.html b/html-test/ref/Bug4.html
index 8ce42486ca7e24aa7b1f9487b4d685802ef7dc5e..4208dc2aafc6732c9ebd2982d6245e6890d579d3 100644
--- a/html-test/ref/Bug4.html
+++ b/html-test/ref/Bug4.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug546.html b/html-test/ref/Bug546.html
index ec37016a8950eaa394ea6b94382f2967535378cc..940f51fcad4af9ea7fa46359b1c1f24223510a13 100644
--- a/html-test/ref/Bug546.html
+++ b/html-test/ref/Bug546.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug548.html b/html-test/ref/Bug548.html
index de6e04ff6e1abada7515bb1bcb86c4cf3dcad579..f9cb90dedc1660164c2215a73ff3943d8e3c1133 100644
--- a/html-test/ref/Bug548.html
+++ b/html-test/ref/Bug548.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug6.html b/html-test/ref/Bug6.html
index 22804de08e58cfb64fbbe554685fbdbb2db58adf..6cd0af6d08ea9ef628c2ff89175254b29872a579 100644
--- a/html-test/ref/Bug6.html
+++ b/html-test/ref/Bug6.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug613.html b/html-test/ref/Bug613.html
index 605e829168146a18ba673eba94fde7f9c4741ae4..2be845458b26556804c2017ddfbcbc7f0ffd9edd 100644
--- a/html-test/ref/Bug613.html
+++ b/html-test/ref/Bug613.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug647.html b/html-test/ref/Bug647.html
index e5a1993e75833b433752dec2fdc92825cc08cfc4..075f8a21e7d987b89982c34c86a9022b0bcde70a 100644
--- a/html-test/ref/Bug647.html
+++ b/html-test/ref/Bug647.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug679.html b/html-test/ref/Bug679.html
index 71eb93601ca0ead4035e942e329a34f51b35ca03..bc09a82c71ae2774e7ca23ab646448eafb5b6674 100644
--- a/html-test/ref/Bug679.html
+++ b/html-test/ref/Bug679.html
@@ -4,6 +4,7 @@
      /><title
     >Bug679</title
     ><link href="#" rel="stylesheet" type="text/css" title="Ocean"
+     /><link rel="stylesheet" type="text/css" href="#"
      /><link rel="stylesheet" type="text/css" href="#"
      /><script src="haddock-bundle.min.js" async="async" type="text/javascript"
     ></script
@@ -12,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -22,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug7.html b/html-test/ref/Bug7.html
index 0b02d297d3ac4ddbd5e87daae7e232e3ccb3b816..5c86f6dc5cb774cb62ff627b93eb3e13c4bfbf4b 100644
--- a/html-test/ref/Bug7.html
+++ b/html-test/ref/Bug7.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug8.html b/html-test/ref/Bug8.html
index 52aee3a0ad72d960b3393c70186e6bee54d5c208..d2b837aba120d3500e9d768891fcd72f26d17fcf 100644
--- a/html-test/ref/Bug8.html
+++ b/html-test/ref/Bug8.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bug85.html b/html-test/ref/Bug85.html
index c8e033bfa29c670c0f3b4b488fa0d37d5e3820ef..69296f1f34ae3398f50427a1075f5d946e29a5ec 100644
--- a/html-test/ref/Bug85.html
+++ b/html-test/ref/Bug85.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/BugDeprecated.html b/html-test/ref/BugDeprecated.html
index 6e187686d269f3c555d99dca89889598b6d0ea8f..21440de50a49dc283503709c418be54c894f8c64 100644
--- a/html-test/ref/BugDeprecated.html
+++ b/html-test/ref/BugDeprecated.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/BugExportHeadings.html b/html-test/ref/BugExportHeadings.html
index 878a767bcd995685f7ad889760e51627da13fe85..a66adf0dccb954ef9ac5d75f9b5b8c0e6fb8cb0a 100644
--- a/html-test/ref/BugExportHeadings.html
+++ b/html-test/ref/BugExportHeadings.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Bugs.html b/html-test/ref/Bugs.html
index 78d2877e4612204fbf6cc89573c5e41ed89a1d95..a81a89d6998c419e2703f6736364c0648df271b0 100644
--- a/html-test/ref/Bugs.html
+++ b/html-test/ref/Bugs.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/BundledPatterns.html b/html-test/ref/BundledPatterns.html
index e8030b3c567165c2fd0779952789c9516373ff09..975b430d16cebbbd5fc3ac9d0f4f253a2fdf37a0 100644
--- a/html-test/ref/BundledPatterns.html
+++ b/html-test/ref/BundledPatterns.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/BundledPatterns2.html b/html-test/ref/BundledPatterns2.html
index 2ed734fbe316f77d0f1dc0f41a08d958cebce2bc..f5eaa212a49dab1f9b6cdf5c92c90e7936cd4294 100644
--- a/html-test/ref/BundledPatterns2.html
+++ b/html-test/ref/BundledPatterns2.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/ConstructorPatternExport.html b/html-test/ref/ConstructorPatternExport.html
index 288459777416f2fec1899e6ea2a84f232c2e723d..11098100e5316e964f4dd2abd2a8b700aaf84b49 100644
--- a/html-test/ref/ConstructorPatternExport.html
+++ b/html-test/ref/ConstructorPatternExport.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/CrossPackageDocs.html b/html-test/ref/CrossPackageDocs.html
index 39d216e00d9fcefc9e8446342a9a832f3bbaffe8..04f443f007101a5286a79882c47d7ed8f8410568 100644
--- a/html-test/ref/CrossPackageDocs.html
+++ b/html-test/ref/CrossPackageDocs.html
@@ -15,6 +15,8 @@ window.onload = function () {pageLoad();setSynopsis("mini_CrossPackageDocs.html"
     ></head
   ><body
   ><div id="package-header"
+    ><div class="caption empty"
+    >&nbsp;</div
     ><ul class="links" id="page-menu"
       ><li
 	><a href=""
@@ -25,8 +27,6 @@ window.onload = function () {pageLoad();setSynopsis("mini_CrossPackageDocs.html"
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      >&nbsp;</p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedClass.html b/html-test/ref/DeprecatedClass.html
index eb9acd6ef18d2066542048d91607a87b86cb1261..0b7037a2b2326db6decbb1a595c57e558591f5a3 100644
--- a/html-test/ref/DeprecatedClass.html
+++ b/html-test/ref/DeprecatedClass.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedData.html b/html-test/ref/DeprecatedData.html
index a9bd0f1ea6f3e4a0ed010f6663e48c179ed622dc..5dc3fda330e6e92ad9165ba3d3b8c46892542e49 100644
--- a/html-test/ref/DeprecatedData.html
+++ b/html-test/ref/DeprecatedData.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedFunction.html b/html-test/ref/DeprecatedFunction.html
index ab45a6542efae0d30c6f2809cdd48d8374d5d862..2591f124c704594d812840d8b6db80e14de16392 100644
--- a/html-test/ref/DeprecatedFunction.html
+++ b/html-test/ref/DeprecatedFunction.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedFunction2.html b/html-test/ref/DeprecatedFunction2.html
index a425627a74f58271b1ad4e598b1f79d3d26409a3..d52af866e35c1c549fcf3877aff615d529d687af 100644
--- a/html-test/ref/DeprecatedFunction2.html
+++ b/html-test/ref/DeprecatedFunction2.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedFunction3.html b/html-test/ref/DeprecatedFunction3.html
index b6186f452c2c9e1e0389907684eaae8a0536b81b..abc92a8bb654fc3de38f11002ca0e0e1a1f18c24 100644
--- a/html-test/ref/DeprecatedFunction3.html
+++ b/html-test/ref/DeprecatedFunction3.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedModule.html b/html-test/ref/DeprecatedModule.html
index 925a211ee83e91c75555c2b4009f0a74599d1b01..e9b2e25f6e4f4b37b80e8924690b5f955d15599f 100644
--- a/html-test/ref/DeprecatedModule.html
+++ b/html-test/ref/DeprecatedModule.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedModule2.html b/html-test/ref/DeprecatedModule2.html
index 3c26b5e16ddc567780568f5746c0ec69bc4d5fc6..b70b6b973fad243f0f864f04f7507533b5ae7809 100644
--- a/html-test/ref/DeprecatedModule2.html
+++ b/html-test/ref/DeprecatedModule2.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedNewtype.html b/html-test/ref/DeprecatedNewtype.html
index 677cd914583400a9a8cca89fb42113a32313e833..1b51cebaf056934953f76973bdda62e58a5a79c9 100644
--- a/html-test/ref/DeprecatedNewtype.html
+++ b/html-test/ref/DeprecatedNewtype.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedReExport.html b/html-test/ref/DeprecatedReExport.html
index 040c00c84e82391423b3fcd9f2ac80840936c66a..732a8dfa3ff8168fa4e3cfaec887f197c5d07838 100644
--- a/html-test/ref/DeprecatedReExport.html
+++ b/html-test/ref/DeprecatedReExport.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedRecord.html b/html-test/ref/DeprecatedRecord.html
index 0c35a240c563f1f1df675b4c1facb139698d0bd8..5681e5b696b88d68bb3a7fa96491697d802b61c0 100644
--- a/html-test/ref/DeprecatedRecord.html
+++ b/html-test/ref/DeprecatedRecord.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedTypeFamily.html b/html-test/ref/DeprecatedTypeFamily.html
index 2754be0cae3fa4e9dfb7870c509db1241cf3164a..ba61ea0be6188ac5c8a5dffc2660404bcc7335d4 100644
--- a/html-test/ref/DeprecatedTypeFamily.html
+++ b/html-test/ref/DeprecatedTypeFamily.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DeprecatedTypeSynonym.html b/html-test/ref/DeprecatedTypeSynonym.html
index 2c6125028d568a4e8ea8526d605f47b0ca172a0b..98bca5bec7212d7d7452df20f9a7442171795c6e 100644
--- a/html-test/ref/DeprecatedTypeSynonym.html
+++ b/html-test/ref/DeprecatedTypeSynonym.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/DuplicateRecordFields.html b/html-test/ref/DuplicateRecordFields.html
index 2aa91466d0a194030c1b7a56b3264aa1064757c7..3f151391a1453d41371930d0db01b30c690b5e74 100644
--- a/html-test/ref/DuplicateRecordFields.html
+++ b/html-test/ref/DuplicateRecordFields.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Examples.html b/html-test/ref/Examples.html
index 5cd3f4c4a4cca8b497280e14329ba5afedd6d41e..04a855f8404dc4ac7a2f6b34f6507212b3b3e965 100644
--- a/html-test/ref/Examples.html
+++ b/html-test/ref/Examples.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Extensions.html b/html-test/ref/Extensions.html
index f08d631e45acc5501eede31c9bfeb502e506c707..44fa557306bc0424c9455c7b94fdd89dc5a9a5d2 100644
--- a/html-test/ref/Extensions.html
+++ b/html-test/ref/Extensions.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/FunArgs.html b/html-test/ref/FunArgs.html
index 1fcbabffe195625b32cbc4bb11c0eb6698789065..04dfb907b508f809d61ece68f6315250e56f27dd 100644
--- a/html-test/ref/FunArgs.html
+++ b/html-test/ref/FunArgs.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/GADTRecords.html b/html-test/ref/GADTRecords.html
index 4496ef12fe660944935dee7d52be8833c0631272..23686adf2b42855ed9a827fcfbaf075868cb1c63 100644
--- a/html-test/ref/GADTRecords.html
+++ b/html-test/ref/GADTRecords.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Hash.html b/html-test/ref/Hash.html
index 37777a4ccf2f49049428c5565e939c1749018aaf..fd8b5114d4d90ed0bbab8210aa20e99a0dda7f7c 100644
--- a/html-test/ref/Hash.html
+++ b/html-test/ref/Hash.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/HiddenInstances.html b/html-test/ref/HiddenInstances.html
index 96e39228faec38e21151522be284df479e8c6670..4f80c418d4c212e5ff96a70c5776a834c8258cf1 100644
--- a/html-test/ref/HiddenInstances.html
+++ b/html-test/ref/HiddenInstances.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/HiddenInstancesB.html b/html-test/ref/HiddenInstancesB.html
index 803d8724389c5d14a2ab147cc0ee7e2a7b42b13c..4039a97910b062ad465d5b898d6899215e706559 100644
--- a/html-test/ref/HiddenInstancesB.html
+++ b/html-test/ref/HiddenInstancesB.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Hyperlinks.html b/html-test/ref/Hyperlinks.html
index ed3a66eb8e635d2b58d15da111aa1a9e6a8a4d4f..12f3ce3dae41220d697651ffa584e623fcce5cda 100644
--- a/html-test/ref/Hyperlinks.html
+++ b/html-test/ref/Hyperlinks.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/IgnoreExports.html b/html-test/ref/IgnoreExports.html
index b5bc1d984428f1a9b36c128962d9fe8dac43604b..3c02b5f5db5689272656947868a5f4c73e225022 100644
--- a/html-test/ref/IgnoreExports.html
+++ b/html-test/ref/IgnoreExports.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/ImplicitParams.html b/html-test/ref/ImplicitParams.html
index 64c9e434036370a279e005c27063e63ee04e1ad3..8e3984527dd128ef4df860ca81374e1ef8874523 100644
--- a/html-test/ref/ImplicitParams.html
+++ b/html-test/ref/ImplicitParams.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Instances.html b/html-test/ref/Instances.html
index 0442a9d54c6ba0efc07d083c63075d83193c2f87..3af35c046c15f6ca6c334ed7746a609c691dbeed 100644
--- a/html-test/ref/Instances.html
+++ b/html-test/ref/Instances.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Math.html b/html-test/ref/Math.html
index ea602266122433a4f8b7bfb810d7252e0467b67c..c4941c60f27673a704a7b10af6f5a2481d91660f 100644
--- a/html-test/ref/Math.html
+++ b/html-test/ref/Math.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Minimal.html b/html-test/ref/Minimal.html
index 547ac3e15fe33077ef83fa3a55c425abe79d2162..065414c4ee360d8265473ca45b1634782bcbf657 100644
--- a/html-test/ref/Minimal.html
+++ b/html-test/ref/Minimal.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/ModuleWithWarning.html b/html-test/ref/ModuleWithWarning.html
index f714eed0b96b9ec437ec7556045b7065f33cf0af..f266234b5e3cc4f48f9f0dbacbcd2d2e13f13f89 100644
--- a/html-test/ref/ModuleWithWarning.html
+++ b/html-test/ref/ModuleWithWarning.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/NamedDoc.html b/html-test/ref/NamedDoc.html
index 5e9ff324032c32b9774f0f537f9fc65d3a76c9aa..285d0a9aa0e74a79d686f7b75306751909e1232e 100644
--- a/html-test/ref/NamedDoc.html
+++ b/html-test/ref/NamedDoc.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Nesting.html b/html-test/ref/Nesting.html
index db26aaa493853edf36a801229a04dbab42e71d85..8d7381b7dfe23de0110db3be2917e8a4f7f4692f 100644
--- a/html-test/ref/Nesting.html
+++ b/html-test/ref/Nesting.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/NoLayout.html b/html-test/ref/NoLayout.html
index b2e9556522e7be8b79a72ed29208f4c19de82667..57b3f71ca1d140e73d3a9e826b9f2ddac0a3b90f 100644
--- a/html-test/ref/NoLayout.html
+++ b/html-test/ref/NoLayout.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/NonGreedy.html b/html-test/ref/NonGreedy.html
index 50de62cdcc97caf43ac3083bcb5f22ac961d1876..282c0ddd6fed5fa9eb4a10bb1f33298fadcf5976 100644
--- a/html-test/ref/NonGreedy.html
+++ b/html-test/ref/NonGreedy.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Operators.html b/html-test/ref/Operators.html
index 96e24086dbe190f510f56f17850ff8f74730a0c3..b863a14070a794fd4d59467082029683e7f5918d 100644
--- a/html-test/ref/Operators.html
+++ b/html-test/ref/Operators.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/OrphanInstances.html b/html-test/ref/OrphanInstances.html
index cb5edd6afebfacff75113a93e3313b9b8b32ec7e..ac8cb0d5824645c97fbca7918544834bfc8f4a2c 100644
--- a/html-test/ref/OrphanInstances.html
+++ b/html-test/ref/OrphanInstances.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/OrphanInstancesClass.html b/html-test/ref/OrphanInstancesClass.html
index 3853f22e0d9eec314b6d77c0c57f0c466ca4f688..70525ae10dc282540244c9a94b4e1ebbfa69b70f 100644
--- a/html-test/ref/OrphanInstancesClass.html
+++ b/html-test/ref/OrphanInstancesClass.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/OrphanInstancesType.html b/html-test/ref/OrphanInstancesType.html
index df559a8a6995582a1c89123e98e6140251ec2ec6..181876008bd6c290b85ff97a6f63b7edbf81fed3 100644
--- a/html-test/ref/OrphanInstancesType.html
+++ b/html-test/ref/OrphanInstancesType.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/PR643.html b/html-test/ref/PR643.html
index b8daa6e5ec68478d27bd13578434ca835cb59004..6fba5964ae68a8c717d2f5108e52f56612de7f25 100644
--- a/html-test/ref/PR643.html
+++ b/html-test/ref/PR643.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/PR643_1.html b/html-test/ref/PR643_1.html
index 421a6f6f5805322085d20a58c941c08cc9c1c0a3..1bfadae16816762c88ec8de95f60c07bf22e6bc2 100644
--- a/html-test/ref/PR643_1.html
+++ b/html-test/ref/PR643_1.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/PatternSyns.html b/html-test/ref/PatternSyns.html
index 4ec39b1775781a4e33708ea7baba1e5673fb0e9c..b106e4f01bc593560a514ef701914648707a63fd 100644
--- a/html-test/ref/PatternSyns.html
+++ b/html-test/ref/PatternSyns.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/PromotedTypes.html b/html-test/ref/PromotedTypes.html
index 41672e3bb9ef12fe18e461412e52990942cf0f7c..1bf256657478d1c4768755a6cf77eb0b7250585a 100644
--- a/html-test/ref/PromotedTypes.html
+++ b/html-test/ref/PromotedTypes.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Properties.html b/html-test/ref/Properties.html
index 7469d488b389b9e64fe4fe497340c4af95f9f2c4..23c9f3b6fcc84172b579c802faee099f08c0de1b 100644
--- a/html-test/ref/Properties.html
+++ b/html-test/ref/Properties.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/PruneWithWarning.html b/html-test/ref/PruneWithWarning.html
index 66747adee55bb207f3d61c0f1e5ac9242aea515a..7f736dea210d78bd430de0847e6e9007478cb592 100644
--- a/html-test/ref/PruneWithWarning.html
+++ b/html-test/ref/PruneWithWarning.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/QuasiExpr.html b/html-test/ref/QuasiExpr.html
index 3e79d16b0078bd6b3498c7e32cd2e61c7df31a5a..7da606033845be222f1ed7c977e8f20e03e6524a 100644
--- a/html-test/ref/QuasiExpr.html
+++ b/html-test/ref/QuasiExpr.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/QuasiQuote.html b/html-test/ref/QuasiQuote.html
index 5afb8db4fef8cb57ab45130d8ad83801ae773899..f7da28502bec063cf34cd7b6c1e5f76a5d065b3f 100644
--- a/html-test/ref/QuasiQuote.html
+++ b/html-test/ref/QuasiQuote.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/SpuriousSuperclassConstraints.html b/html-test/ref/SpuriousSuperclassConstraints.html
index 747811ea50071fe6237106004efec68993b82df3..67ece044a4b9e65724fe7393c9847df9f8524270 100644
--- a/html-test/ref/SpuriousSuperclassConstraints.html
+++ b/html-test/ref/SpuriousSuperclassConstraints.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/TH.html b/html-test/ref/TH.html
index 9fb5eee2fb08d25d209b1d18fb6a31c7c15bdc31..3c2f36c34eae9d9de7b4d1260c2f222b4048848e 100644
--- a/html-test/ref/TH.html
+++ b/html-test/ref/TH.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/TH2.html b/html-test/ref/TH2.html
index 0f6a5e7d27ed08d80e77a8561aa56d19ff3e00cb..ebe9a7e7d3ce29a5c5a568b41bbbd97ac09a0240 100644
--- a/html-test/ref/TH2.html
+++ b/html-test/ref/TH2.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Table.html b/html-test/ref/Table.html
index 352277ca79ed581e0a186041b448f8288d8acdd0..98b83d94c97b31bd2c0137b5f262e43fa245226f 100644
--- a/html-test/ref/Table.html
+++ b/html-test/ref/Table.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Test.html b/html-test/ref/Test.html
index 5fbb8f19cef9942882b86c143cb13a010a519384..ef09f281aabf01a8c01d80b7c2f96d1e11f00e5f 100644
--- a/html-test/ref/Test.html
+++ b/html-test/ref/Test.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Threaded.html b/html-test/ref/Threaded.html
index 135831af9e3f4f107c6f8d8c82f858fc5653c0e4..b35c800c8ac08e776a3e279e72e7ad10460d4912 100644
--- a/html-test/ref/Threaded.html
+++ b/html-test/ref/Threaded.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Threaded_TH.html b/html-test/ref/Threaded_TH.html
index cbfdc984ed9cdc41f190bb927dddecd4e3972609..9bb6812886bc16abc41f65eec2b5fc5087b7bfd4 100644
--- a/html-test/ref/Threaded_TH.html
+++ b/html-test/ref/Threaded_TH.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Ticket112.html b/html-test/ref/Ticket112.html
index 957929765580d9f3ae4c0ecbcc23f00fab32e576..72a006670ec7053e0271a0a6e68c4686d78b4e50 100644
--- a/html-test/ref/Ticket112.html
+++ b/html-test/ref/Ticket112.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Ticket61.html b/html-test/ref/Ticket61.html
index 06d949415717c9d12b598b14865e761d2686dbb1..9fdb81c16ad33759268b72c227670f27bf7fc6a1 100644
--- a/html-test/ref/Ticket61.html
+++ b/html-test/ref/Ticket61.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Ticket75.html b/html-test/ref/Ticket75.html
index a1a25faf171a7e0eac4ddff6780f9e8bb2f3e3e4..5b82e8d917ed6dff05afde9877860e095d4b9c9b 100644
--- a/html-test/ref/Ticket75.html
+++ b/html-test/ref/Ticket75.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/TitledPicture.html b/html-test/ref/TitledPicture.html
index 86e6e39f3b521f49d4c59f824e3960aecba2be6b..e5da2a60a0465b883f595c8958b774a5e863f4d1 100644
--- a/html-test/ref/TitledPicture.html
+++ b/html-test/ref/TitledPicture.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/TypeFamilies.html b/html-test/ref/TypeFamilies.html
index 8f1aba2ed85d3cdb1e6c1a2dc40b2339c7deb6aa..b51f85a11363513c895d027c6846559b2a297739 100644
--- a/html-test/ref/TypeFamilies.html
+++ b/html-test/ref/TypeFamilies.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/TypeFamilies2.html b/html-test/ref/TypeFamilies2.html
index acddceb649ba568e6c7231aaaf08f69418f09a94..3241fab479a1459cdf0566dfba6067246856b74f 100644
--- a/html-test/ref/TypeFamilies2.html
+++ b/html-test/ref/TypeFamilies2.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/TypeOperators.html b/html-test/ref/TypeOperators.html
index c8c0f90e6dd71051acce6dbb924027aaf360967b..7d74e528fb519e9575428ae2a801888b37ab6d5a 100644
--- a/html-test/ref/TypeOperators.html
+++ b/html-test/ref/TypeOperators.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Unicode.html b/html-test/ref/Unicode.html
index ce3cf7e30e331a6f041664326388e826e98c7661..890c401f0ed9ae3f9dfdffae0cce6196dfbda38c 100644
--- a/html-test/ref/Unicode.html
+++ b/html-test/ref/Unicode.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"
diff --git a/html-test/ref/Visible.html b/html-test/ref/Visible.html
index daddc6d455f6152d2cf6c44c2854459433bb8ff9..1bafae3f17a815282c94edbcb119b2eb71f2eee6 100644
--- a/html-test/ref/Visible.html
+++ b/html-test/ref/Visible.html
@@ -13,7 +13,9 @@
     ></head
   ><body
   ><div id="package-header"
-    ><ul class="links" id="page-menu"
+    ><div class="caption empty"
+      ></div
+      ><ul class="links" id="page-menu"
       ><li
 	><a href="#"
 	  >Contents</a
@@ -23,8 +25,6 @@
 	  >Index</a
 	  ></li
 	></ul
-      ><p class="caption empty"
-      ></p
       ></div
     ><div id="content"
     ><div id="module-header"