diff --git a/hypsrc-test/ref/src/Records.html b/hypsrc-test/ref/src/Records.html
index 256b952fb8a6c8a7568fe78c65e94a779cb4e21d..885a5d5a147c93db1a516969a9278554c3ae9b63 100644
--- a/hypsrc-test/ref/src/Records.html
+++ b/hypsrc-test/ref/src/Records.html
@@ -862,10 +862,7 @@ forall a. Num a => a -> a -> a
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>x :: Int
-</span
-	><a href="Records.html#x"
+      ><a href="Records.html#x"
 	><span class="hs-identifier hs-var"
 	  >x</span
 	  ></a
@@ -877,10 +874,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>Point -&gt; Int
-</span
-	><a href="Records.html#x"
+      ><a href="Records.html#x"
 	><span class="hs-identifier hs-var"
 	  >x</span
 	  ></a
@@ -888,32 +882,22 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>Point
-</span
-	><a href="#"
-	><span class="hs-identifier hs-var"
+      ><a href="#"
+	><span class="hs-identifier hs-type"
 	  >p</span
 	  ></a
 	></span
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>Int -&gt; Int -&gt; Int
-forall a. Num a =&gt; a -&gt; a -&gt; a
-</span
-	><span class="hs-operator hs-var"
+      ><span class="hs-operator hs-type"
 	>+</span
 	></span
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>Int
-</span
-	><a href="#"
-	><span class="hs-identifier hs-var"
+      ><a href="#"
+	><span class="hs-identifier hs-type"
 	  >d</span
 	  ></a
 	></span
@@ -985,10 +969,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>y :: Int
-</span
-	><a href="Records.html#y"
+      ><a href="Records.html#y"
 	><span class="hs-identifier hs-var"
 	  >y</span
 	  ></a
@@ -1000,10 +981,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>Point -&gt; Int
-</span
-	><a href="Records.html#y"
+      ><a href="Records.html#y"
 	><span class="hs-identifier hs-var"
 	  >y</span
 	  ></a
@@ -1011,32 +989,22 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>Point
-</span
-	><a href="#"
-	><span class="hs-identifier hs-var"
+      ><a href="#"
+	><span class="hs-identifier hs-type"
 	  >p</span
 	  ></a
 	></span
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>Int -&gt; Int -&gt; Int
-forall a. Num a =&gt; a -&gt; a -&gt; a
-</span
-	><span class="hs-operator hs-var"
+      ><span class="hs-operator hs-type"
 	>+</span
 	></span
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>Int
-</span
-	><a href="#"
-	><span class="hs-identifier hs-var"
+      ><a href="#"
+	><span class="hs-identifier hs-type"
 	  >d</span
 	  ></a
 	></span
@@ -1337,10 +1305,7 @@ y :: Int
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>x :: Int
-</span
-	><a href="Records.html#x"
+      ><a href="Records.html#x"
 	><span class="hs-identifier hs-var"
 	  >x</span
 	  ></a
@@ -1352,32 +1317,22 @@ y :: Int
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>Int
-</span
-	><a href="#"
-	><span class="hs-identifier hs-var"
+      ><a href="#"
+	><span class="hs-identifier hs-type"
 	  >x</span
 	  ></a
 	></span
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>Int -&gt; Int -&gt; Int
-forall a. Num a =&gt; a -&gt; a -&gt; a
-</span
-	><span class="hs-operator hs-var"
+      ><span class="hs-operator hs-type"
 	>+</span
 	></span
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>Int
-</span
-	><a href="#"
-	><span class="hs-identifier hs-var"
+      ><a href="#"
+	><span class="hs-identifier hs-type"
 	  >dx</span
 	  ></a
 	></span
@@ -1386,10 +1341,7 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>y :: Int
-</span
-	><a href="Records.html#y"
+      ><a href="Records.html#y"
 	><span class="hs-identifier hs-var"
 	  >y</span
 	  ></a
@@ -1401,32 +1353,22 @@ forall a. Num a =&gt; a -&gt; a -&gt; a
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>Int
-</span
-	><a href="#"
-	><span class="hs-identifier hs-var"
+      ><a href="#"
+	><span class="hs-identifier hs-type"
 	  >y</span
 	  ></a
 	></span
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>Int -&gt; Int -&gt; Int
-forall a. Num a =&gt; a -&gt; a -&gt; a
-</span
-	><span class="hs-operator hs-var"
+      ><span class="hs-operator hs-type"
 	>+</span
 	></span
       ><span
       > </span
       ><span class="annot"
-      ><span class="annottext"
-	>Int
-</span
-	><a href="#"
-	><span class="hs-identifier hs-var"
+      ><a href="#"
+	><span class="hs-identifier hs-type"
 	  >dy</span
 	  ></a
 	></span