doctool: update tests

177 files changed, 1593 insertions, 314 deletions

diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None-a.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None-a.page
deleted file mode 100644
index 11f20db8..00000000
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None-a.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.AnAnonymousUnion.None-a"
-      type="topic"
-      style="field"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    <link xref="Regress.AnAnonymousUnion.None" group="field" type="guide"/>
-  </info>
-  <title>Regress.AnAnonymousUnion.None->a</title>
-
-
-</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None-padding.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None-padding.page
deleted file mode 100644
index 631770e0..00000000
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None-padding.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.AnAnonymousUnion.None-padding"
-      type="topic"
-      style="field"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    <link xref="Regress.AnAnonymousUnion.None" group="field" type="guide"/>
-  </info>
-  <title>Regress.AnAnonymousUnion.None->padding</title>
-
-
-</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page
index eb2f134c..8fac9916 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.allow_none.page
@@ -32,7 +32,7 @@ GObject* regress_annotation_object_allow_none (RegressAnnotationObject* object,
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>somearg</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page
index 7cafa4df..f8b93937 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleeowns.page
@@ -32,11 +32,11 @@ gint regress_annotation_object_calleeowns (RegressAnnotationObject* object,
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>toown</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page
index 6e5fdcc3..36d6b60a 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.calleesowns.page
@@ -37,15 +37,15 @@ gint regress_annotation_object_calleesowns (RegressAnnotationObject* object,
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>toown1</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>toown2</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page
index 106fdb9b..38a7d662 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum.page
@@ -32,7 +32,7 @@ void regress_annotation_object_compute_sum (RegressAnnotationObject* object,
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>nums</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page
index cde8be69..38c0bcbe 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.compute_sum_n.page
@@ -37,7 +37,7 @@ void regress_annotation_object_compute_sum_n (RegressAnnotationObject* object,
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>nums</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page
index d7e9b9e9..e485b872 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.create_object.page
@@ -27,7 +27,7 @@ GObject* regress_annotation_object_create_object (RegressAnnotationObject* objec
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page
index ca159039..a70e3353 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.do_not_use.page
@@ -27,7 +27,7 @@ GObject* regress_annotation_object_do_not_use (RegressAnnotationObject* object);
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page
index fa9f22df..514b23dd 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_hash.page
@@ -28,7 +28,7 @@ objects.</p>
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page
index 628c8147..e01d0921 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_objects.page
@@ -29,7 +29,7 @@ intentionally similar example to gtk_container_get_children</p>
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page
index c1911c90..739a1194 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.get_strings.page
@@ -28,7 +28,7 @@ each string needs to be freed.</p>
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page
index e871ff59..a741e9af 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.in.page
@@ -32,7 +32,7 @@ gint regress_annotation_object_in (RegressAnnotationObject* object,
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inarg</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page
index 160aceaa..b9cbfe8f 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout.page
@@ -32,7 +32,7 @@ gint regress_annotation_object_inout (RegressAnnotationObject* object,
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inoutarg</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page
index 3c48561c..f4f9638c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout2.page
@@ -32,7 +32,7 @@ gint regress_annotation_object_inout2 (RegressAnnotationObject* object,
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inoutarg</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page
index c0870f29..d000434c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.inout3.page
@@ -32,7 +32,7 @@ gint regress_annotation_object_inout3 (RegressAnnotationObject* object,
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inoutarg</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page
index c137afd6..1558a2b7 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.method.page
@@ -27,7 +27,7 @@ gint regress_annotation_object_method (RegressAnnotationObject* object);
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page
index a76fe813..7cc60026 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.notrans.page
@@ -27,7 +27,7 @@ GObject* regress_annotation_object_notrans (RegressAnnotationObject* object);
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page
index 169e040a..90f4bcfc 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.out.page
@@ -32,7 +32,7 @@ gint regress_annotation_object_out (RegressAnnotationObject* object,
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>outarg</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page
index a5385dc6..4ef5cb7f 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.use_buffer.page
@@ -32,7 +32,7 @@ void regress_annotation_object_use_buffer (RegressAnnotationObject* object,
 <terms>
 <item>
 <title><code>object</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>bytes</code></title>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page
index 219a773d..6052118a 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch.page
@@ -11,7 +11,7 @@
       <api:returns>
         <api:type>void</api:type>
       </api:returns>
-      <api:name>regress_annotation_object_watch</api:name>
+      <api:name>regress_annotation_object_watch_full</api:name>
       <api:arg>
         <api:type>RegressAnnotationObject*</api:type>
         <api:name>object</api:name>
@@ -24,16 +24,20 @@
         <api:type>gpointer</api:type>
         <api:name>user_data</api:name>
       </api:arg>
+      <api:arg>
+        <api:type>GDestroyNotify</api:type>
+        <api:name>destroy</api:name>
+      </api:arg>
     </api:function>
   </info>
-  <title>regress_annotation_object_watch</title>
+  <title>regress_annotation_object_watch_full</title>
   <synopsis><code mime="text/x-csrc">
-void regress_annotation_object_watch (RegressAnnotationObject* object,
-                                      RegressAnnotationForeachFunc func,
-                                      gpointer user_data);
+void regress_annotation_object_watch_full (RegressAnnotationObject* object,
+                                           RegressAnnotationForeachFunc func,
+                                           gpointer user_data,
+                                           GDestroyNotify destroy);
   </code></synopsis>
-  <p>This is here just for the sake of being overriden by its
-<link xref="Regress.watch_full"/>.</p>
+  <p>Test overriding via the "Rename To" annotation.</p>
 
 <terms>
 <item>
@@ -49,6 +53,10 @@ void regress_annotation_object_watch (RegressAnnotationObject* object,
   <p>The callback data</p>
 </item>
 <item>
+<title><code>destroy</code></title>
+  <p>Destroy notification</p>
+</item>
+<item>
 <title><code>Returns</code></title>
 
 </item>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page
deleted file mode 100644
index 5c2acdb9..00000000
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnnotationObject.watch_full.page
+++ /dev/null
@@ -1,65 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.AnnotationObject.watch_full"
-      type="topic"
-      style="method"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    <link xref="Regress.AnnotationObject" group="method" type="guide"/>
-    <api:function>
-      <api:returns>
-        <api:type>void</api:type>
-      </api:returns>
-      <api:name>regress_annotation_object_watch_full</api:name>
-      <api:arg>
-        <api:type>RegressAnnotationObject*</api:type>
-        <api:name>object</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>RegressAnnotationForeachFunc</api:type>
-        <api:name>func</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>gpointer</api:type>
-        <api:name>user_data</api:name>
-      </api:arg>
-      <api:arg>
-        <api:type>GDestroyNotify</api:type>
-        <api:name>destroy</api:name>
-      </api:arg>
-    </api:function>
-  </info>
-  <title>regress_annotation_object_watch_full</title>
-  <synopsis><code mime="text/x-csrc">
-void regress_annotation_object_watch_full (RegressAnnotationObject* object,
-                                           RegressAnnotationForeachFunc func,
-                                           gpointer user_data,
-                                           GDestroyNotify destroy);
-  </code></synopsis>
-  <p>Test overriding via the "Rename To" annotation.</p>
-
-<terms>
-<item>
-<title><code>object</code></title>
-  <p>A <link xref="Regress.AnnotationObject"/></p>
-</item>
-<item>
-<title><code>func</code></title>
-  <p>The callback</p>
-</item>
-<item>
-<title><code>user_data</code></title>
-  <p>The callback data</p>
-</item>
-<item>
-<title><code>destroy</code></title>
-  <p>Destroy notification</p>
-</item>
-<item>
-<title><code>Returns</code></title>
-
-</item>
-</terms>
-
-</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooBufferClass.page
index c9db2dd9..dd411f7c 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.AnAnonymousUnion.None.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooBufferClass.page
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<page id="Regress.AnAnonymousUnion.None"
+<page id="Regress.FooBufferClass"
       type="guide"
       style="class"
       xmlns="http://projectmallard.org/1.0/"
@@ -8,7 +8,7 @@
   <info>
     <link xref="index" group="class" type="guide"/>
   </info>
-  <title>Regress.AnAnonymousUnion.None</title>
+  <title>Regress.FooBufferClass</title>
 
 
   <links type="topic" ui:expanded="true"
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page
index bcf81f2f..43ac5299 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.method.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooEnumType" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>int</api:type>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page
index 85335dac..96a0003d 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooEnumType.returnv.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooEnumType" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>RegressFooEnumType</api:type>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page
index aa715354..fb8559ca 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooError.quark.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GQuark</api:type>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObjectClass.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObjectClass.page
new file mode 100644
index 00000000..7b15b42d
--- /dev/null
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooOtherObjectClass.page
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<page id="Regress.FooOtherObjectClass"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.FooOtherObjectClass</title>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.FooStructPrivate.page b/tests/scanner/Regress-1.0-C-expected/Regress.FooStructPrivate.page
new file mode 100644
index 00000000..6d460be2
--- /dev/null
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.FooStructPrivate.page
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<page id="Regress.FooStructPrivate"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.FooStructPrivate</title>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.Intset.page b/tests/scanner/Regress-1.0-C-expected/Regress.Intset.page
new file mode 100644
index 00000000..69d83001
--- /dev/null
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.Intset.page
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<page id="Regress.Intset"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.Intset</title>
+  <p>Like telepathy-glib's TpIntset.</p>
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page
index fd90ef34..ab2b7736 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestABCError.quark.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestABCError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GQuark</api:type>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedPrivate.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedPrivate.page
new file mode 100644
index 00000000..8523949d
--- /dev/null
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestBoxedPrivate.page
@@ -0,0 +1,35 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedPrivate"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.TestBoxedPrivate</title>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-csrc"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page
index 815a1567..0b2d8f73 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestEnum.param.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestEnum" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>const gchar*</api:type>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page
index bab90dab..97774c14 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestError.quark.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GQuark</api:type>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page
index 5a07ab53..9bb6a280 100644
--- a/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.TestOtherError.quark.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestOtherError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GQuark</api:type>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_method.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_method.page
new file mode 100644
index 00000000..dd1b24b9
--- /dev/null
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_method.page
@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<page id="Regress.test_boxeds_not_a_method"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_test_boxeds_not_a_method</api:name>
+      <api:arg>
+        <api:type>RegressTestBoxed*</api:type>
+        <api:name>boxed</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>regress_test_boxeds_not_a_method</title>
+  <synopsis><code mime="text/x-csrc">
+void regress_test_boxeds_not_a_method (RegressTestBoxed* boxed);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_static.page b/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_static.page
new file mode 100644
index 00000000..583fa939
--- /dev/null
+++ b/tests/scanner/Regress-1.0-C-expected/Regress.test_boxeds_not_a_static.page
@@ -0,0 +1,30 @@
+<?xml version="1.0"?>
+<page id="Regress.test_boxeds_not_a_static"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_test_boxeds_not_a_static</api:name>
+    </api:function>
+  </info>
+  <title>regress_test_boxeds_not_a_static</title>
+  <synopsis><code mime="text/x-csrc">
+void regress_test_boxeds_not_a_static (void);
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page
index f0b11e81..377a063d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.ATestError.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.ATestError"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -25,5 +25,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-arr.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-arr.page
index 8074ffda..a95e09df 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-arr.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationFields-arr.page
@@ -11,7 +11,7 @@
   </info>
   <title>Regress.AnnotationFields.arr</title>
   <synopsis><code mime="text/x-gjs">
-AnnotationFields.arr: Array(Number(guint8)) (Read / Write)
+AnnotationFields.arr: ByteArray (Read / Write)
   </code></synopsis>
   <p>an array of length @len</p>
 
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
index 64d872f5..076d9a29 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.allow_none.page
@@ -20,7 +20,7 @@
   </info>
   <title>Regress.AnnotationObject.prototype.allow_none</title>
   <synopsis><code mime="text/x-gjs">
-function allow_none(somearg: String): <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> {
+function allow_none(somearg: String): <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> {
     // Gjs wrapper for regress_annotation_object_allow_none()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
index 75741225..e9620c85 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleeowns.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.AnnotationObject.prototype.calleeowns</title>
   <synopsis><code mime="text/x-gjs">
-function calleeowns(): [return_value: Number(gint), toown: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link>] {
+function calleeowns(): [return_value: Number(gint), toown: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link>] {
     // Gjs wrapper for regress_annotation_object_calleeowns()
 }
   </code></synopsis>
@@ -29,7 +29,7 @@ function calleeowns(): [return_value: Number(gint), toown: <link href="../GObjec
 </item>
 <item>
 <title><code>toown</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 </terms>
 
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
index 33ba8e53..3741558d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.calleesowns.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.AnnotationObject.prototype.calleesowns</title>
   <synopsis><code mime="text/x-gjs">
-function calleesowns(): [return_value: Number(gint), toown1: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link>, toown2: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link>] {
+function calleesowns(): [return_value: Number(gint), toown1: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link>, toown2: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link>] {
     // Gjs wrapper for regress_annotation_object_calleesowns()
 }
   </code></synopsis>
@@ -29,11 +29,11 @@ function calleesowns(): [return_value: Number(gint), toown1: <link href="../GObj
 </item>
 <item>
 <title><code>toown1</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>toown2</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 </terms>
 
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
index 8752d9ff..b82f3a39 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.create_object.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.AnnotationObject.prototype.create_object</title>
   <synopsis><code mime="text/x-gjs">
-function create_object(): <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> {
+function create_object(): <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> {
     // Gjs wrapper for regress_annotation_object_create_object()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
index 331b7e04..2455d62d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.do_not_use.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.AnnotationObject.prototype.do_not_use</title>
   <synopsis><code mime="text/x-gjs">
-function do_not_use(): <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> {
+function do_not_use(): <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> {
     // Gjs wrapper for regress_annotation_object_do_not_use()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
index a411ad87..efaa504e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.get_hash.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.AnnotationObject.prototype.get_hash</title>
   <synopsis><code mime="text/x-gjs">
-function get_hash(): {String: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link>} {
+function get_hash(): {String: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link>} {
     // Gjs wrapper for regress_annotation_object_get_hash()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
index 8edd9cbf..ecb3e9a8 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.notrans.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.AnnotationObject.prototype.notrans</title>
   <synopsis><code mime="text/x-gjs">
-function notrans(): <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> {
+function notrans(): <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> {
     // Gjs wrapper for regress_annotation_object_notrans()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page
index 43e0c1bb..1114cea2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data.page
@@ -13,14 +13,14 @@
       </api:returns>
       <api:name>regress_annotation_object_set_data</api:name>
       <api:arg>
-        <api:type>Array(Number(guint8))</api:type>
+        <api:type>ByteArray</api:type>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
   </info>
   <title>Regress.AnnotationObject.prototype.set_data</title>
   <synopsis><code mime="text/x-gjs">
-function set_data(data: Array(Number(guint8))): void {
+function set_data(data: ByteArray): void {
     // Gjs wrapper for regress_annotation_object_set_data()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page
index 70204151..83a2349a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data2.page
@@ -13,14 +13,14 @@
       </api:returns>
       <api:name>regress_annotation_object_set_data2</api:name>
       <api:arg>
-        <api:type>Array(Number(gint8))</api:type>
+        <api:type>ByteArray</api:type>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
   </info>
   <title>Regress.AnnotationObject.prototype.set_data2</title>
   <synopsis><code mime="text/x-gjs">
-function set_data2(data: Array(Number(gint8))): void {
+function set_data2(data: ByteArray): void {
     // Gjs wrapper for regress_annotation_object_set_data2()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page
index 14709d97..ffef4ec1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.set_data3.page
@@ -13,14 +13,14 @@
       </api:returns>
       <api:name>regress_annotation_object_set_data3</api:name>
       <api:arg>
-        <api:type>Array(Number(guint8))</api:type>
+        <api:type>ByteArray</api:type>
         <api:name>data</api:name>
       </api:arg>
     </api:function>
   </info>
   <title>Regress.AnnotationObject.prototype.set_data3</title>
   <synopsis><code mime="text/x-gjs">
-function set_data3(data: Array(Number(guint8))): void {
+function set_data3(data: ByteArray): void {
     // Gjs wrapper for regress_annotation_object_set_data3()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page
index 3701b581..70963d41 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch_full.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.AnnotationObject.watch.page
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<page id="Regress.AnnotationObject.watch_full"
+<page id="Regress.AnnotationObject.watch"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
@@ -18,9 +18,9 @@
       </api:arg>
     </api:function>
   </info>
-  <title>Regress.AnnotationObject.prototype.watch_full</title>
+  <title>Regress.AnnotationObject.prototype.watch</title>
   <synopsis><code mime="text/x-gjs">
-function watch_full(func: <link xref="Regress.AnnotationForeachFunc">Regress.AnnotationForeachFunc</link>): void {
+function watch(func: <link xref="Regress.AnnotationForeachFunc">Regress.AnnotationForeachFunc</link>): void {
     // Gjs wrapper for regress_annotation_object_watch_full()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page
index 2af7b9e4..ee97008a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooASingle.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.FooASingle"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -17,5 +17,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page
index a4b82a3e..16ee99dc 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooAddressType.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.FooAddressType"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -25,5 +25,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page
new file mode 100644
index 00000000..f09ba879
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBRect.new.page
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBRect.new"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooBRect" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.FooBRect</api:type>
+      </api:returns>
+      <api:name>regress_foo_brect_new</api:name>
+      <api:arg>
+        <api:type>Number(gdouble)</api:type>
+        <api:name>x</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>Number(gdouble)</api:type>
+        <api:name>y</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.FooBRect.new</title>
+  <synopsis><code mime="text/x-gjs">
+function new(x: Number(gdouble), y: Number(gdouble)): <link xref="Regress.FooBRect">Regress.FooBRect</link> {
+    // Gjs wrapper for regress_foo_brect_new()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>y</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.new.page
new file mode 100644
index 00000000..da064a6d
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBUnion.new.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBUnion.new"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooBUnion" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.FooBUnion</api:type>
+      </api:returns>
+      <api:name>regress_foo_bunion_new</api:name>
+    </api:function>
+  </info>
+  <title>Regress.FooBUnion.new</title>
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.FooBUnion">Regress.FooBUnion</link> {
+    // Gjs wrapper for regress_foo_bunion_new()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page
new file mode 100644
index 00000000..ab3a5336
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooBoxed.new.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<page id="Regress.FooBoxed.new"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooBoxed" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.FooBoxed</api:type>
+      </api:returns>
+      <api:name>regress_foo_boxed_new</api:name>
+    </api:function>
+  </info>
+  <title>Regress.FooBoxed.new</title>
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.FooBoxed">Regress.FooBoxed</link> {
+    // Gjs wrapper for regress_foo_boxed_new()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page
index 61843918..2d364628 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumFullname.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.FooEnumFullname"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -25,5 +25,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page
index 44c091a9..fb10ef72 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumNoType.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.FooEnumNoType"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -29,5 +29,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.method.page
index 61a41afe..c5c166de 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.method.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooEnumType" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>Number(gint)</api:type>
@@ -18,7 +18,7 @@
       </api:arg>
     </api:function>
   </info>
-  <title>Regress.method</title>
+  <title>Regress.FooEnumType.method</title>
   <synopsis><code mime="text/x-gjs">
 function method(regress_foo_enum: <link xref="Regress.FooEnumType">Regress.FooEnumType</link>): Number(gint) {
     // Gjs wrapper for regress_foo_enum_type_method()
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page
index 5827bd60..1a920597 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.FooEnumType"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -25,5 +25,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.returnv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.returnv.page
index 004f7a3d..d5c274be 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.returnv.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooEnumType.returnv.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooEnumType" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>Regress.FooEnumType</api:type>
@@ -18,7 +18,7 @@
       </api:arg>
     </api:function>
   </info>
-  <title>Regress.returnv</title>
+  <title>Regress.FooEnumType.returnv</title>
   <synopsis><code mime="text/x-gjs">
 function returnv(x: Number(gint)): <link xref="Regress.FooEnumType">Regress.FooEnumType</link> {
     // Gjs wrapper for regress_foo_enum_type_returnv()
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page
index 873701b0..ef474860 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.FooError"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -25,5 +25,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.quark.page
index 4c3e58b3..794fbb57 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.quark.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooError.quark.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
@@ -14,9 +14,9 @@
       <api:name>regress_foo_error_quark</api:name>
     </api:function>
   </info>
-  <title>Regress.quark</title>
+  <title>Regress.FooError.quark</title>
   <synopsis><code mime="text/x-gjs">
-function quark(): <link href="../GLib-2.0/GLib.Quark.page">GLib.Quark</link> {
+function quark(): <link href="../GLib-2.0/GLib.Quark.html">GLib.Quark</link> {
     // Gjs wrapper for regress_foo_error_quark()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page
new file mode 100644
index 00000000..7040d19f
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooForeignStruct.new.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<page id="Regress.FooForeignStruct.new"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooForeignStruct" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.FooForeignStruct</api:type>
+      </api:returns>
+      <api:name>regress_foo_foreign_struct_new</api:name>
+    </api:function>
+  </info>
+  <title>Regress.FooForeignStruct.new</title>
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.FooForeignStruct">Regress.FooForeignStruct</link> {
+    // Gjs wrapper for regress_foo_foreign_struct_new()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page
index f455012d..92f2c60a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject-signal.page
@@ -11,7 +11,7 @@
   </info>
   <title>Regress.FooObject::signal</title>
   <synopsis><code mime="text/x-gjs">
-connect('signal', function (fooObject, object: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link>, p0: void, ): String);
+connect('signal', function (fooObject, object: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link>, p0: void, ): String);
   </code></synopsis>
 
 
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page
index 6c3a99b2..ba829fbc 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.a_global_method.page
@@ -20,7 +20,7 @@
   </info>
   <title>Regress.FooObject.a_global_method</title>
   <synopsis><code mime="text/x-gjs">
-function a_global_method(obj: <link href="../Utility-1.0/Utility.Object.page">Utility.Object</link>): void {
+function a_global_method(obj: <link href="../Utility-1.0/Utility.Object.html">Utility.Object</link>): void {
     // Gjs wrapper for regress_foo_object_a_global_method()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
index 9d962d12..e1e6b81c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.external_type.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.FooObject.prototype.external_type</title>
   <synopsis><code mime="text/x-gjs">
-function external_type(): <link href="../Utility-1.0/Utility.Object.page">Utility.Object</link> {
+function external_type(): <link href="../Utility-1.0/Utility.Object.html">Utility.Object</link> {
     // Gjs wrapper for regress_foo_object_external_type()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page
index 6e8b1d62..a5cad517 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.handle_glyph.page
@@ -20,7 +20,7 @@
   </info>
   <title>Regress.FooObject.prototype.handle_glyph</title>
   <synopsis><code mime="text/x-gjs">
-function handle_glyph(glyph: <link href="../Utility-1.0/Utility.Glyph.page">Utility.Glyph</link>): void {
+function handle_glyph(glyph: <link href="../Utility-1.0/Utility.Glyph.html">Utility.Glyph</link>): void {
     // Gjs wrapper for regress_foo_object_handle_glyph()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page
new file mode 100644
index 00000000..5411fde1
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<page id="Regress.FooObject.new"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooObject" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.FooObject</api:type>
+      </api:returns>
+      <api:name>regress_foo_object_new</api:name>
+    </api:function>
+  </info>
+  <title>Regress.FooObject.new</title>
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.FooObject">Regress.FooObject</link> {
+    // Gjs wrapper for regress_foo_object_new()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page
new file mode 100644
index 00000000..7cc20b93
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooObject.new_as_super.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<page id="Regress.FooObject.new_as_super"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooObject" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>GObject.Object</api:type>
+      </api:returns>
+      <api:name>regress_foo_object_new_as_super</api:name>
+    </api:function>
+  </info>
+  <title>Regress.FooObject.new_as_super</title>
+  <synopsis><code mime="text/x-gjs">
+function new_as_super(): <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> {
+    // Gjs wrapper for regress_foo_object_new_as_super()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page
index bb6bc51d..711561c0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooStackLayer.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.FooStackLayer"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -49,5 +49,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page
index 51e23667..5bc8639f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface-do_baz.page
@@ -10,7 +10,7 @@
   </info>
   <title>Regress.FooSubInterface::do_baz</title>
   <synopsis><code mime="text/x-gjs">
-function vfunc_do_baz(callback: <link href="../GObject-2.0/GObject.Callback.page">GObject.Callback</link>): void {
+function vfunc_do_baz(callback: <link href="../GObject-2.0/GObject.Callback.html">GObject.Callback</link>): void {
 }
   </code></synopsis>
 
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page
index 7f07e006..44cc71b0 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubInterface.do_baz.page
@@ -20,7 +20,7 @@
   </info>
   <title>Regress.FooSubInterface.prototype.do_baz</title>
   <synopsis><code mime="text/x-gjs">
-function do_baz(callback: <link href="../GObject-2.0/GObject.Callback.page">GObject.Callback</link>): void {
+function do_baz(callback: <link href="../GObject-2.0/GObject.Callback.html">GObject.Callback</link>): void {
     // Gjs wrapper for regress_foo_sub_interface_do_baz()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page
new file mode 100644
index 00000000..0e39571d
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooSubobject.new.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<page id="Regress.FooSubobject.new"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.FooSubobject" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.FooSubobject</api:type>
+      </api:returns>
+      <api:name>regress_foo_subobject_new</api:name>
+    </api:function>
+  </info>
+  <title>Regress.FooSubobject.new</title>
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.FooSubobject">Regress.FooSubobject</link> {
+    // Gjs wrapper for regress_foo_subobject_new()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct-bar.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct-bar.page
index 5dca9693..325c7ece 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct-bar.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.FooUtilityStruct-bar.page
@@ -11,7 +11,7 @@
   </info>
   <title>Regress.FooUtilityStruct.bar</title>
   <synopsis><code mime="text/x-gjs">
-FooUtilityStruct.bar: <link href="../Utility-1.0/Utility.Struct.page">Utility.Struct</link> (Read / Write)
+FooUtilityStruct.bar: <link href="../Utility-1.0/Utility.Struct.html">Utility.Struct</link> (Read / Write)
   </code></synopsis>
 
 
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page
index 9ab21894..18c41d8a 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.TestABCError"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -25,5 +25,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.quark.page
index c9c560d3..1701f5aa 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.quark.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestABCError.quark.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestABCError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
@@ -14,9 +14,9 @@
       <api:name>regress_test_abc_error_quark</api:name>
     </api:function>
   </info>
-  <title>Regress.quark</title>
+  <title>Regress.TestABCError.quark</title>
   <synopsis><code mime="text/x-gjs">
-function quark(): <link href="../GLib-2.0/GLib.Quark.page">GLib.Quark</link> {
+function quark(): <link href="../GLib-2.0/GLib.Quark.html">GLib.Quark</link> {
     // Gjs wrapper for regress_test_abc_error_quark()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page
new file mode 100644
index 00000000..d93d80df
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxed.new.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxed.new"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxed" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.TestBoxed</api:type>
+      </api:returns>
+      <api:name>regress_test_boxed_new</api:name>
+    </api:function>
+  </info>
+  <title>Regress.TestBoxed.new</title>
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.TestBoxed">Regress.TestBoxed</link> {
+    // Gjs wrapper for regress_test_boxed_new()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page
new file mode 100644
index 00000000..32953007
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedB.new.page
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedB.new"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxedB" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.TestBoxedB</api:type>
+      </api:returns>
+      <api:name>regress_test_boxed_b_new</api:name>
+      <api:arg>
+        <api:type>Number(gint8)</api:type>
+        <api:name>some_int8</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>Number(glong)</api:type>
+        <api:name>some_long</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.TestBoxedB.new</title>
+  <synopsis><code mime="text/x-gjs">
+function new(some_int8: Number(gint8), some_long: Number(glong)): <link xref="Regress.TestBoxedB">Regress.TestBoxedB</link> {
+    // Gjs wrapper for regress_test_boxed_b_new()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>some_int8</code></title>
+
+</item>
+<item>
+<title><code>some_long</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page
new file mode 100644
index 00000000..62b63cd1
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedC.new.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedC.new"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxedC" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.TestBoxedC</api:type>
+      </api:returns>
+      <api:name>regress_test_boxed_c_new</api:name>
+    </api:function>
+  </info>
+  <title>Regress.TestBoxedC.new</title>
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.TestBoxedC">Regress.TestBoxedC</link> {
+    // Gjs wrapper for regress_test_boxed_c_new()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page
new file mode 100644
index 00000000..eecc4d29
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.new.page
@@ -0,0 +1,48 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedD.new"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestBoxedD" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.TestBoxedD</api:type>
+      </api:returns>
+      <api:name>regress_test_boxed_d_new</api:name>
+      <api:arg>
+        <api:type>String</api:type>
+        <api:name>a_string</api:name>
+      </api:arg>
+      <api:arg>
+        <api:type>Number(gint)</api:type>
+        <api:name>a_int</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.TestBoxedD.new</title>
+  <synopsis><code mime="text/x-gjs">
+function new(a_string: String, a_int: Number(gint)): <link xref="Regress.TestBoxedD">Regress.TestBoxedD</link> {
+    // Gjs wrapper for regress_test_boxed_d_new()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>a_string</code></title>
+
+</item>
+<item>
+<title><code>a_int</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page
index 093b4f9c..60b03622 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestBoxedD.page
@@ -12,7 +12,7 @@
   <synopsis><code>
 const Regress = imports.gi.Regress;
 
-let testBoxedD = new Regress.TestBoxedD();
+let testBoxedD = new Regress.TestBoxedD(a_string: String, a_int: Number(gint));
   </code></synopsis>
 
 
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page
index 9e1e285f..a5a59cc5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackGError.page
@@ -10,7 +10,7 @@
   </info>
   <title>Regress.TestCallbackGError</title>
   <synopsis><code mime="text/x-gjs">
-function onTestCallbackGError(error: <link href="../GLib-2.0/GLib.Error.page">GLib.Error</link>): void {
+function onTestCallbackGError(error: <link href="../GLib-2.0/GLib.Error.html">GLib.Error</link>): void {
 }
   </code></synopsis>
 
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page
index 9052a9d1..0df50927 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestCallbackOwnedGError.page
@@ -10,7 +10,7 @@
   </info>
   <title>Regress.TestCallbackOwnedGError</title>
   <synopsis><code mime="text/x-gjs">
-function onTestCallbackOwnedGError(error: <link href="../GLib-2.0/GLib.Error.page">GLib.Error</link>): void {
+function onTestCallbackOwnedGError(error: <link href="../GLib-2.0/GLib.Error.html">GLib.Error</link>): void {
 }
   </code></synopsis>
 
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page
index 4ee86378..1451c6dc 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestDEFError.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.TestDEFError"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -25,5 +25,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page
index 10a6897d..d7ac4077 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.TestEnum"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -29,5 +29,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.param.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.param.page
index cab98809..34e512d1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.param.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnum.param.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestEnum" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>String</api:type>
@@ -18,7 +18,7 @@
       </api:arg>
     </api:function>
   </info>
-  <title>Regress.param</title>
+  <title>Regress.TestEnum.param</title>
   <synopsis><code mime="text/x-gjs">
 function param(e: <link xref="Regress.TestEnum">Regress.TestEnum</link>): String {
     // Gjs wrapper for regress_test_enum_param()
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page
index 34de1b89..ff5505cc 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumNoGEnum.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.TestEnumNoGEnum"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -25,5 +25,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page
index e6976c87..75da7940 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestEnumUnsigned.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.TestEnumUnsigned"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -21,5 +21,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page
index 15f5583e..0e6c7813 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.TestError"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -25,5 +25,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.quark.page
index d03d1793..d143125c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.quark.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestError.quark.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
@@ -14,9 +14,9 @@
       <api:name>regress_test_error_quark</api:name>
     </api:function>
   </info>
-  <title>Regress.quark</title>
+  <title>Regress.TestError.quark</title>
   <synopsis><code mime="text/x-gjs">
-function quark(): <link href="../GLib-2.0/GLib.Quark.page">GLib.Quark</link> {
+function quark(): <link href="../GLib-2.0/GLib.Quark.html">GLib.Quark</link> {
     // Gjs wrapper for regress_test_error_quark()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
new file mode 100644
index 00000000..431c141e
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFloating.new.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFloating.new"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFloating" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.TestFloating</api:type>
+      </api:returns>
+      <api:name>regress_test_floating_new</api:name>
+    </api:function>
+  </info>
+  <title>Regress.TestFloating.new</title>
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.TestFloating">Regress.TestFloating</link> {
+    // Gjs wrapper for regress_test_floating_new()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-copy.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-copy.page
new file mode 100644
index 00000000..53d28b77
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-copy.page
@@ -0,0 +1,25 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject-copy"
+      type="topic"
+      style="vfunc"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="vfunc" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObject::copy</title>
+  <synopsis><code mime="text/x-gjs">
+function vfunc_copy(): <link xref="Regress.TestFundamentalObject">Regress.TestFundamentalObject</link> {
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-finalize.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-finalize.page
new file mode 100644
index 00000000..efe549b8
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject-finalize.page
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject-finalize"
+      type="topic"
+      style="vfunc"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="vfunc" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObject::finalize</title>
+  <synopsis><code mime="text/x-gjs">
+function vfunc_finalize(): void {
+}
+  </code></synopsis>
+
+
+<terms>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page
new file mode 100644
index 00000000..8534fc40
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.page
@@ -0,0 +1,57 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalObject</title>
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testFundamentalObject = new Regress.TestFundamentalObject();
+  </code></synopsis>
+
+
+  <synopsis>
+    <title>Hierarchy</title>
+    <tree>
+      <item>
+        <code>Regress.TestFundamentalObject</code>
+      </item>
+    </tree>
+  </synopsis>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="property" style="linklist">
+    <title>Properties</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="signal" style="linklist">
+    <title>Signals</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
+    <title>Virtual functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
new file mode 100644
index 00000000..153a7596
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.ref.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject.ref"
+      type="topic"
+      style="method"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="method" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.TestFundamentalObject</api:type>
+      </api:returns>
+      <api:name>regress_test_fundamental_object_ref</api:name>
+    </api:function>
+  </info>
+  <title>Regress.TestFundamentalObject.prototype.ref</title>
+  <synopsis><code mime="text/x-gjs">
+function ref(): <link xref="Regress.TestFundamentalObject">Regress.TestFundamentalObject</link> {
+    // Gjs wrapper for regress_test_fundamental_object_ref()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page
new file mode 100644
index 00000000..ba365e57
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalObject.unref.page
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalObject.unref"
+      type="topic"
+      style="method"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalObject" group="method" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_test_fundamental_object_unref</api:name>
+    </api:function>
+  </info>
+  <title>Regress.TestFundamentalObject.prototype.unref</title>
+  <synopsis><code mime="text/x-gjs">
+function unref(): void {
+    // Gjs wrapper for regress_test_fundamental_object_unref()
+}
+  </code></synopsis>
+
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page
new file mode 100644
index 00000000..8a43ee28
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.new.page
@@ -0,0 +1,42 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalSubObject.new"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestFundamentalSubObject"
+      group="constructor"
+      type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.TestFundamentalSubObject</api:type>
+      </api:returns>
+      <api:name>regress_test_fundamental_sub_object_new</api:name>
+      <api:arg>
+        <api:type>String</api:type>
+        <api:name>data</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.TestFundamentalSubObject.new</title>
+  <synopsis><code mime="text/x-gjs">
+function new(data: String): <link xref="Regress.TestFundamentalSubObject">Regress.TestFundamentalSubObject</link> {
+    // Gjs wrapper for regress_test_fundamental_sub_object_new()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>data</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page
new file mode 100644
index 00000000..8de3d7c3
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestFundamentalSubObject.page
@@ -0,0 +1,60 @@
+<?xml version="1.0"?>
+<page id="Regress.TestFundamentalSubObject"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.TestFundamentalSubObject</title>
+  <synopsis><code>
+const Regress = imports.gi.Regress;
+
+let testFundamentalSubObject = new Regress.TestFundamentalSubObject();
+  </code></synopsis>
+
+
+  <synopsis>
+    <title>Hierarchy</title>
+    <tree>
+      <item>
+        <code>Regress.TestFundamentalObject</code>
+      <item>
+        <code>Regress.TestFundamentalSubObject</code>
+      </item>
+      </item>
+    </tree>
+  </synopsis>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="property" style="linklist">
+    <title>Properties</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="signal" style="linklist">
+    <title>Signals</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="vfunc" style="linklist">
+    <title>Virtual functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page
index c6d70c41..b279e017 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-bare.page
@@ -11,7 +11,7 @@
   </info>
   <title>Regress.TestObj.bare</title>
   <synopsis><code mime="text/x-gjs">
-TestObj.bare: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> (Read / Write)
+TestObj.bare: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> (Read / Write)
   </code></synopsis>
 
 
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page
index 4746b475..42194fab 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-foreign-struct.page
@@ -11,7 +11,7 @@
   </info>
   <title>Regress.TestObj::sig-with-foreign-struct</title>
   <synopsis><code mime="text/x-gjs">
-connect('sig-with-foreign-struct', function (testObj, cr: <link href="../cairo-1.0/cairo.Context.page">cairo.Context</link>, ): void);
+connect('sig-with-foreign-struct', function (testObj, cr: <link href="../cairo-1.0/cairo.Context.html">cairo.Context</link>, ): void);
   </code></synopsis>
 
 
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page
index c3c9e0d9..6118eff6 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-hash-prop.page
@@ -11,7 +11,7 @@
   </info>
   <title>Regress.TestObj::sig-with-hash-prop</title>
   <synopsis><code mime="text/x-gjs">
-connect('sig-with-hash-prop', function (testObj, hash: {String: <link href="../GObject-2.0/GObject.Value.page">GObject.Value</link>}, ): void);
+connect('sig-with-hash-prop', function (testObj, hash: {String: <link href="../GObject-2.0/GObject.Value.html">GObject.Value</link>}, ): void);
   </code></synopsis>
   <p>This test signal is like TelepathyGlib's
  TpAccount::status-changed</p>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page
index 89cfd330..5d230bd1 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj-sig-with-obj.page
@@ -11,7 +11,7 @@
   </info>
   <title>Regress.TestObj::sig-with-obj</title>
   <synopsis><code mime="text/x-gjs">
-connect('sig-with-obj', function (testObj, obj: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link>, ): void);
+connect('sig-with-obj', function (testObj, obj: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link>, ): void);
   </code></synopsis>
   <p>Test transfer none GObject as a param (tests refcounting).
 Use with regress_test_obj_emit_sig_with_obj</p>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page
new file mode 100644
index 00000000..177defd8
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.constructor.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj.constructor"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.TestObj</api:type>
+      </api:returns>
+      <api:name>regress_constructor</api:name>
+    </api:function>
+  </info>
+  <title>Regress.TestObj.constructor</title>
+  <synopsis><code mime="text/x-gjs">
+function constructor(): <link xref="Regress.TestObj">Regress.TestObj</link> {
+    // Gjs wrapper for regress_constructor()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page
new file mode 100644
index 00000000..8be6b748
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new.page
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj.new"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.TestObj</api:type>
+      </api:returns>
+      <api:name>regress_test_obj_new</api:name>
+      <api:arg>
+        <api:type>Regress.TestObj</api:type>
+        <api:name>obj</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.TestObj.new</title>
+  <synopsis><code mime="text/x-gjs">
+function new(obj: <link xref="Regress.TestObj">Regress.TestObj</link>): <link xref="Regress.TestObj">Regress.TestObj</link> {
+    // Gjs wrapper for regress_test_obj_new()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>obj</code></title>
+  <p>A <link xref="Regress.TestObj"/></p>
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page
new file mode 100644
index 00000000..0e735d06
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_callback.page
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj.new_callback"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.TestObj</api:type>
+      </api:returns>
+      <api:name>regress_test_obj_new_callback</api:name>
+      <api:arg>
+        <api:type>Regress.TestCallbackUserData</api:type>
+        <api:name>callback</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.TestObj.new_callback</title>
+  <synopsis><code mime="text/x-gjs">
+function new_callback(callback: <link xref="Regress.TestCallbackUserData">Regress.TestCallbackUserData</link>): <link xref="Regress.TestObj">Regress.TestObj</link> {
+    // Gjs wrapper for regress_test_obj_new_callback()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>callback</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page
new file mode 100644
index 00000000..2b83a34a
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.new_from_file.page
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<page id="Regress.TestObj.new_from_file"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestObj" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.TestObj</api:type>
+      </api:returns>
+      <api:name>regress_test_obj_new_from_file</api:name>
+      <api:arg>
+        <api:type>String</api:type>
+        <api:name>x</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.TestObj.new_from_file</title>
+  <synopsis><code mime="text/x-gjs">
+function new_from_file(x: String): <link xref="Regress.TestObj">Regress.TestObj</link> {
+    // Gjs wrapper for regress_test_obj_new_from_file()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>x</code></title>
+
+</item>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page
index 9ca9aca5..2e5d07f5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestObj.set_bare.page
@@ -20,7 +20,7 @@
   </info>
   <title>Regress.TestObj.prototype.set_bare</title>
   <synopsis><code mime="text/x-gjs">
-function set_bare(bare: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link>): void {
+function set_bare(bare: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link>): void {
     // Gjs wrapper for regress_test_obj_set_bare()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page
index f968c9ce..da0844e4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.TestOtherError"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -25,5 +25,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.quark.page
index 6e95aa2a..98efd78e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.quark.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestOtherError.quark.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestOtherError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
@@ -14,9 +14,9 @@
       <api:name>regress_test_unconventional_error_quark</api:name>
     </api:function>
   </info>
-  <title>Regress.quark</title>
+  <title>Regress.TestOtherError.quark</title>
   <synopsis><code mime="text/x-gjs">
-function quark(): <link href="../GLib-2.0/GLib.Quark.page">GLib.Quark</link> {
+function quark(): <link href="../GLib-2.0/GLib.Quark.html">GLib.Quark</link> {
     // Gjs wrapper for regress_test_unconventional_error_quark()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestReferenceEnum.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestReferenceEnum.page
index afda5f30..2394ff1b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestReferenceEnum.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestReferenceEnum.page
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <page id="Regress.TestReferenceEnum"
-      type="topic"
+      type="guide"
       style="enum"
       xmlns="http://projectmallard.org/1.0/"
       xmlns:api="http://projectmallard.org/experimental/api/"
@@ -37,5 +37,9 @@
 
 </item>
 </terms>
-
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/x-gjs"
+         groups="function" style="linklist">
+    <title>Functions</title>
+  </links>
 </page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-obj.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-obj.page
index 162697cd..1ead3fcb 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-obj.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestStructC-obj.page
@@ -11,7 +11,7 @@
   </info>
   <title>Regress.TestStructC.obj</title>
   <synopsis><code mime="text/x-gjs">
-TestStructC.obj: <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> (Read)
+TestStructC.obj: <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> (Read)
   </code></synopsis>
 
 
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page
new file mode 100644
index 00000000..833ed236
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestSubObj.new.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<page id="Regress.TestSubObj.new"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestSubObj" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.TestObj</api:type>
+      </api:returns>
+      <api:name>regress_test_sub_obj_new</api:name>
+    </api:function>
+  </info>
+  <title>Regress.TestSubObj.new</title>
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.TestObj">Regress.TestObj</link> {
+    // Gjs wrapper for regress_test_sub_obj_new()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page
new file mode 100644
index 00000000..3d041a15
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.TestWi8021x.new.page
@@ -0,0 +1,32 @@
+<?xml version="1.0"?>
+<page id="Regress.TestWi8021x.new"
+      type="topic"
+      style="constructor"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="Regress.TestWi8021x" group="constructor" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>Regress.TestWi8021x</api:type>
+      </api:returns>
+      <api:name>regress_test_wi_802_1x_new</api:name>
+    </api:function>
+  </info>
+  <title>Regress.TestWi8021x.new</title>
+  <synopsis><code mime="text/x-gjs">
+function new(): <link xref="Regress.TestWi8021x">Regress.TestWi8021x</link> {
+    // Gjs wrapper for regress_test_wi_802_1x_new()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>Returns</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page
index 07187dfa..9d1de5ec 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_ptr_array.page
@@ -20,7 +20,7 @@
   </info>
   <title>Regress.annotation_ptr_array</title>
   <synopsis><code mime="text/x-gjs">
-function annotation_ptr_array(array: Array(<link href="../GObject-2.0/GObject.Value.page">GObject.Value</link>)): void {
+function annotation_ptr_array(array: Array(<link href="../GObject-2.0/GObject.Value.html">GObject.Value</link>)): void {
     // Gjs wrapper for regress_annotation_ptr_array()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page
index 0b152a77..3fb70932 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_test_parsing_bug630862.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.annotation_test_parsing_bug630862</title>
   <synopsis><code mime="text/x-gjs">
-function annotation_test_parsing_bug630862(): <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> {
+function annotation_test_parsing_bug630862(): <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> {
     // Gjs wrapper for regress_annotation_test_parsing_bug630862()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page
index 07aefcbd..25a4aeb2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.annotation_transfer_floating.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.annotation_transfer_floating</title>
   <synopsis><code mime="text/x-gjs">
-function annotation_transfer_floating(): <link href="../GObject-2.0/GObject.Object.page">GObject.Object</link> {
+function annotation_transfer_floating(): <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link> {
     // Gjs wrapper for regress_annotation_transfer_floating()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page
index 93664962..2d81ed0f 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.atest_error_quark.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.atest_error_quark</title>
   <synopsis><code mime="text/x-gjs">
-function atest_error_quark(): <link href="../GLib-2.0/GLib.Quark.page">GLib.Quark</link> {
+function atest_error_quark(): <link href="../GLib-2.0/GLib.Quark.html">GLib.Quark</link> {
     // Gjs wrapper for regress_atest_error_quark()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page
index 54040ad5..d285f4ee 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_async_ready_callback.page
@@ -24,7 +24,7 @@
   </info>
   <title>Regress.foo_async_ready_callback</title>
   <synopsis><code mime="text/x-gjs">
-function foo_async_ready_callback(cancellable: <link href="../Gio-2.0/Gio.Cancellable.page">Gio.Cancellable</link>, callback: <link href="../Gio-2.0/Gio.AsyncReadyCallback.page">Gio.AsyncReadyCallback</link>): void {
+function foo_async_ready_callback(cancellable: <link href="../Gio-2.0/Gio.Cancellable.html">Gio.Cancellable</link>, callback: <link href="../Gio-2.0/Gio.AsyncReadyCallback.html">Gio.AsyncReadyCallback</link>): void {
     // Gjs wrapper for regress_foo_async_ready_callback()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page
index 1bb3afb2..00ff1f92 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.foo_method_external_references.page
@@ -32,7 +32,7 @@
   </info>
   <title>Regress.foo_method_external_references</title>
   <synopsis><code mime="text/x-gjs">
-function foo_method_external_references(object: <link href="../Utility-1.0/Utility.Object.page">Utility.Object</link>, e: <link href="../Utility-1.0/Utility.EnumType.page">Utility.EnumType</link>, f: <link href="../Utility-1.0/Utility.FlagType.page">Utility.FlagType</link>, s: <link href="../Utility-1.0/Utility.Struct.page">Utility.Struct</link>): void {
+function foo_method_external_references(object: <link href="../Utility-1.0/Utility.Object.html">Utility.Object</link>, e: <link href="../Utility-1.0/Utility.EnumType.html">Utility.EnumType</link>, f: <link href="../Utility-1.0/Utility.FlagType.html">Utility.FlagType</link>, s: <link href="../Utility-1.0/Utility.Struct.html">Utility.Struct</link>): void {
     // Gjs wrapper for regress_foo_method_external_references()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page
index 617f7a4e..b60ee631 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_array_gint8_in.page
@@ -13,14 +13,14 @@
       </api:returns>
       <api:name>regress_test_array_gint8_in</api:name>
       <api:arg>
-        <api:type>Array(Number(gint8))</api:type>
+        <api:type>ByteArray</api:type>
         <api:name>ints</api:name>
       </api:arg>
     </api:function>
   </info>
   <title>Regress.test_array_gint8_in</title>
   <synopsis><code mime="text/x-gjs">
-function test_array_gint8_in(ints: Array(Number(gint8))): Number(gint) {
+function test_array_gint8_in(ints: ByteArray): Number(gint) {
     // Gjs wrapper for regress_test_array_gint8_in()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page
index c4625e05..00b92ad9 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_async_ready_callback.page
@@ -20,7 +20,7 @@
   </info>
   <title>Regress.test_async_ready_callback</title>
   <synopsis><code mime="text/x-gjs">
-function test_async_ready_callback(callback: <link href="../Gio-2.0/Gio.AsyncReadyCallback.page">Gio.AsyncReadyCallback</link>): void {
+function test_async_ready_callback(callback: <link href="../Gio-2.0/Gio.AsyncReadyCallback.html">Gio.AsyncReadyCallback</link>): void {
     // Gjs wrapper for regress_test_async_ready_callback()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_method.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_method.page
new file mode 100644
index 00000000..27bda3f5
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_method.page
@@ -0,0 +1,36 @@
+<?xml version="1.0"?>
+<page id="Regress.test_boxeds_not_a_method"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_test_boxeds_not_a_method</api:name>
+      <api:arg>
+        <api:type>Regress.TestBoxed</api:type>
+        <api:name>boxed</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.test_boxeds_not_a_method</title>
+  <synopsis><code mime="text/x-gjs">
+function test_boxeds_not_a_method(boxed: <link xref="Regress.TestBoxed">Regress.TestBoxed</link>): void {
+    // Gjs wrapper for regress_test_boxeds_not_a_method()
+}
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_static.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_static.page
new file mode 100644
index 00000000..2d7eb0bb
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_boxeds_not_a_static.page
@@ -0,0 +1,26 @@
+<?xml version="1.0"?>
+<page id="Regress.test_boxeds_not_a_static"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>void</api:type>
+      </api:returns>
+      <api:name>regress_test_boxeds_not_a_static</api:name>
+    </api:function>
+  </info>
+  <title>Regress.test_boxeds_not_a_static</title>
+  <synopsis><code mime="text/x-gjs">
+function test_boxeds_not_a_static(): void {
+    // Gjs wrapper for regress_test_boxeds_not_a_static()
+}
+  </code></synopsis>
+
+
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page
index 2c6a5aad..d46fdff2 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_full_return.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.test_cairo_context_full_return</title>
   <synopsis><code mime="text/x-gjs">
-function test_cairo_context_full_return(): <link href="../cairo-1.0/cairo.Context.page">cairo.Context</link> {
+function test_cairo_context_full_return(): <link href="../cairo-1.0/cairo.Context.html">cairo.Context</link> {
     // Gjs wrapper for regress_test_cairo_context_full_return()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page
index 66a02d68..99dc4dcf 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_context_none_in.page
@@ -20,7 +20,7 @@
   </info>
   <title>Regress.test_cairo_context_none_in</title>
   <synopsis><code mime="text/x-gjs">
-function test_cairo_context_none_in(context: <link href="../cairo-1.0/cairo.Context.page">cairo.Context</link>): void {
+function test_cairo_context_none_in(context: <link href="../cairo-1.0/cairo.Context.html">cairo.Context</link>): void {
     // Gjs wrapper for regress_test_cairo_context_none_in()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page
index 18d52ed9..90053936 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_out.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.test_cairo_surface_full_out</title>
   <synopsis><code mime="text/x-gjs">
-function test_cairo_surface_full_out(): <link href="../cairo-1.0/cairo.Surface.page">cairo.Surface</link> {
+function test_cairo_surface_full_out(): <link href="../cairo-1.0/cairo.Surface.html">cairo.Surface</link> {
     // Gjs wrapper for regress_test_cairo_surface_full_out()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page
index efe27fab..54bd1469 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_full_return.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.test_cairo_surface_full_return</title>
   <synopsis><code mime="text/x-gjs">
-function test_cairo_surface_full_return(): <link href="../cairo-1.0/cairo.Surface.page">cairo.Surface</link> {
+function test_cairo_surface_full_return(): <link href="../cairo-1.0/cairo.Surface.html">cairo.Surface</link> {
     // Gjs wrapper for regress_test_cairo_surface_full_return()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page
index 4c10e3ca..f61da521 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_in.page
@@ -20,7 +20,7 @@
   </info>
   <title>Regress.test_cairo_surface_none_in</title>
   <synopsis><code mime="text/x-gjs">
-function test_cairo_surface_none_in(surface: <link href="../cairo-1.0/cairo.Surface.page">cairo.Surface</link>): void {
+function test_cairo_surface_none_in(surface: <link href="../cairo-1.0/cairo.Surface.html">cairo.Surface</link>): void {
     // Gjs wrapper for regress_test_cairo_surface_none_in()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page
index 688dbe22..81f9a55b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_cairo_surface_none_return.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.test_cairo_surface_none_return</title>
   <synopsis><code mime="text/x-gjs">
-function test_cairo_surface_none_return(): <link href="../cairo-1.0/cairo.Surface.page">cairo.Surface</link> {
+function test_cairo_surface_none_return(): <link href="../cairo-1.0/cairo.Surface.html">cairo.Surface</link> {
     // Gjs wrapper for regress_test_cairo_surface_none_return()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page
index 1b68fd0d..f83698da 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure.page
@@ -20,7 +20,7 @@
   </info>
   <title>Regress.test_closure</title>
   <synopsis><code mime="text/x-gjs">
-function test_closure(closure: <link href="../GObject-2.0/GObject.Closure.page">GObject.Closure</link>): Number(gint) {
+function test_closure(closure: <link href="../GObject-2.0/GObject.Closure.html">GObject.Closure</link>): Number(gint) {
     // Gjs wrapper for regress_test_closure()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page
index 77503426..56d9c0db 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_one_arg.page
@@ -24,7 +24,7 @@
   </info>
   <title>Regress.test_closure_one_arg</title>
   <synopsis><code mime="text/x-gjs">
-function test_closure_one_arg(closure: <link href="../GObject-2.0/GObject.Closure.page">GObject.Closure</link>, arg: Number(gint)): Number(gint) {
+function test_closure_one_arg(closure: <link href="../GObject-2.0/GObject.Closure.html">GObject.Closure</link>, arg: Number(gint)): Number(gint) {
     // Gjs wrapper for regress_test_closure_one_arg()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page
index 6051b9d8..cbda2a17 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_closure_variant.page
@@ -24,7 +24,7 @@
   </info>
   <title>Regress.test_closure_variant</title>
   <synopsis><code mime="text/x-gjs">
-function test_closure_variant(closure: <link href="../GObject-2.0/GObject.Closure.page">GObject.Closure</link>, arg: <link href="../GLib-2.0/GLib.Variant.page">GLib.Variant</link>): <link href="../GLib-2.0/GLib.Variant.page">GLib.Variant</link> {
+function test_closure_variant(closure: <link href="../GObject-2.0/GObject.Closure.html">GObject.Closure</link>, arg: <link href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link>): <link href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link> {
     // Gjs wrapper for regress_test_closure_variant()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page
index 9c4a1d73..743cc31e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_date_in_gvalue.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.test_date_in_gvalue</title>
   <synopsis><code mime="text/x-gjs">
-function test_date_in_gvalue(): <link href="../GObject-2.0/GObject.Value.page">GObject.Value</link> {
+function test_date_in_gvalue(): <link href="../GObject-2.0/GObject.Value.html">GObject.Value</link> {
     // Gjs wrapper for regress_test_date_in_gvalue()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page
index 6038e26c..055ea75e 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_def_error_quark.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.test_def_error_quark</title>
   <synopsis><code mime="text/x-gjs">
-function test_def_error_quark(): <link href="../GLib-2.0/GLib.Quark.page">GLib.Quark</link> {
+function test_def_error_quark(): <link href="../GLib-2.0/GLib.Quark.html">GLib.Quark</link> {
     // Gjs wrapper for regress_test_def_error_quark()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page
index ee7851cc..fefc9aa5 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_in.page
@@ -20,7 +20,7 @@
   </info>
   <title>Regress.test_ghash_gvalue_in</title>
   <synopsis><code mime="text/x-gjs">
-function test_ghash_gvalue_in(hash: {String: <link href="../GObject-2.0/GObject.Value.page">GObject.Value</link>}): void {
+function test_ghash_gvalue_in(hash: {String: <link href="../GObject-2.0/GObject.Value.html">GObject.Value</link>}): void {
     // Gjs wrapper for regress_test_ghash_gvalue_in()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page
index 3c734ef0..141015e3 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_ghash_gvalue_return.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.test_ghash_gvalue_return</title>
   <synopsis><code mime="text/x-gjs">
-function test_ghash_gvalue_return(): {String: <link href="../GObject-2.0/GObject.Value.page">GObject.Value</link>} {
+function test_ghash_gvalue_return(): {String: <link href="../GObject-2.0/GObject.Value.html">GObject.Value</link>} {
     // Gjs wrapper for regress_test_ghash_gvalue_return()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page
index b6e67505..0e2d25de 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_as.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.test_gvariant_as</title>
   <synopsis><code mime="text/x-gjs">
-function test_gvariant_as(): <link href="../GLib-2.0/GLib.Variant.page">GLib.Variant</link> {
+function test_gvariant_as(): <link href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link> {
     // Gjs wrapper for regress_test_gvariant_as()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page
index e17b3358..d0fc5b6c 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_asv.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.test_gvariant_asv</title>
   <synopsis><code mime="text/x-gjs">
-function test_gvariant_asv(): <link href="../GLib-2.0/GLib.Variant.page">GLib.Variant</link> {
+function test_gvariant_asv(): <link href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link> {
     // Gjs wrapper for regress_test_gvariant_asv()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page
index 3bf68570..2244a4d4 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_i.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.test_gvariant_i</title>
   <synopsis><code mime="text/x-gjs">
-function test_gvariant_i(): <link href="../GLib-2.0/GLib.Variant.page">GLib.Variant</link> {
+function test_gvariant_i(): <link href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link> {
     // Gjs wrapper for regress_test_gvariant_i()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page
index 40741bc3..7c440d62 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_s.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.test_gvariant_s</title>
   <synopsis><code mime="text/x-gjs">
-function test_gvariant_s(): <link href="../GLib-2.0/GLib.Variant.page">GLib.Variant</link> {
+function test_gvariant_s(): <link href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link> {
     // Gjs wrapper for regress_test_gvariant_s()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page
index 3a5cfe7b..f10adede 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_gvariant_v.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.test_gvariant_v</title>
   <synopsis><code mime="text/x-gjs">
-function test_gvariant_v(): <link href="../GLib-2.0/GLib.Variant.page">GLib.Variant</link> {
+function test_gvariant_v(): <link href="../GLib-2.0/GLib.Variant.html">GLib.Variant</link> {
     // Gjs wrapper for regress_test_gvariant_v()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page
index 64d400e3..6d613895 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_int_value_arg.page
@@ -20,7 +20,7 @@
   </info>
   <title>Regress.test_int_value_arg</title>
   <synopsis><code mime="text/x-gjs">
-function test_int_value_arg(v: <link href="../GObject-2.0/GObject.Value.page">GObject.Value</link>): Number(gint) {
+function test_int_value_arg(v: <link href="../GObject-2.0/GObject.Value.html">GObject.Value</link>): Number(gint) {
     // Gjs wrapper for regress_test_int_value_arg()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page
index 83cbe066..3aeec50b 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_strv_in_gvalue.page
@@ -16,7 +16,7 @@
   </info>
   <title>Regress.test_strv_in_gvalue</title>
   <synopsis><code mime="text/x-gjs">
-function test_strv_in_gvalue(): <link href="../GObject-2.0/GObject.Value.page">GObject.Value</link> {
+function test_strv_in_gvalue(): <link href="../GObject-2.0/GObject.Value.html">GObject.Value</link> {
     // Gjs wrapper for regress_test_strv_in_gvalue()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page
index e9dfd23f..1493360d 100644
--- a/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page
+++ b/tests/scanner/Regress-1.0-Gjs-expected/Regress.test_value_return.page
@@ -20,7 +20,7 @@
   </info>
   <title>Regress.test_value_return</title>
   <synopsis><code mime="text/x-gjs">
-function test_value_return(i: Number(gint)): <link href="../GObject-2.0/GObject.Value.page">GObject.Value</link> {
+function test_value_return(i: Number(gint)): <link href="../GObject-2.0/GObject.Value.html">GObject.Value</link> {
     // Gjs wrapper for regress_test_value_return()
 }
   </code></synopsis>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None-a.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None-a.page
deleted file mode 100644
index 11f20db8..00000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None-a.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.AnAnonymousUnion.None-a"
-      type="topic"
-      style="field"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    <link xref="Regress.AnAnonymousUnion.None" group="field" type="guide"/>
-  </info>
-  <title>Regress.AnAnonymousUnion.None->a</title>
-
-
-</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None-padding.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None-padding.page
deleted file mode 100644
index 631770e0..00000000
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None-padding.page
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0"?>
-<page id="Regress.AnAnonymousUnion.None-padding"
-      type="topic"
-      style="field"
-      xmlns="http://projectmallard.org/1.0/"
-      xmlns:api="http://projectmallard.org/experimental/api/"
-      xmlns:ui="http://projectmallard.org/1.0/ui/">
-  <info>
-    <link xref="Regress.AnAnonymousUnion.None" group="field" type="guide"/>
-  </info>
-  <title>Regress.AnAnonymousUnion.None->padding</title>
-
-
-</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page
index 92add7ac..0b184159 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.allow_none.page
@@ -34,7 +34,7 @@ def allow_none(self, somearg):
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>somearg</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page
index f0e9b137..bab5a57a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleeowns.page
@@ -34,11 +34,11 @@ def calleeowns(self, toown):
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>toown</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page
index 5f313c72..eec4b164 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.calleesowns.page
@@ -38,15 +38,15 @@ def calleesowns(self, toown1, toown2):
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>toown1</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>toown2</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page
index 5b692246..56d438e0 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum.page
@@ -34,7 +34,7 @@ def compute_sum(self, nums):
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>nums</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page
index 2384a879..3845573e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.compute_sum_n.page
@@ -38,7 +38,7 @@ def compute_sum_n(self, nums, n_nums):
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>nums</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page
index d0e01a3c..c4e6562b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.create_object.page
@@ -30,7 +30,7 @@ def create_object(self):
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page
index d04b3bca..d3aee4ae 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.do_not_use.page
@@ -30,7 +30,7 @@ def do_not_use(self):
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page
index e4418038..f23a57d7 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_hash.page
@@ -31,7 +31,7 @@ objects.</p>
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
index 20bb511b..957eb46a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_objects.page
@@ -32,7 +32,7 @@ intentionally similar example to gtk_container_get_children</p>
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
index ba3f1b19..fb4d16d5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.get_strings.page
@@ -31,7 +31,7 @@ each string needs to be freed.</p>
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page
index 51c19ead..4e983c15 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.in.page
@@ -34,7 +34,7 @@ def in(self, inarg):
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inarg</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page
index 9dadcb5a..01aa1a36 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout.page
@@ -34,7 +34,7 @@ def inout(self, inoutarg):
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inoutarg</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page
index 769850e8..f862c2fa 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout2.page
@@ -34,7 +34,7 @@ def inout2(self, inoutarg):
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inoutarg</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page
index 5eb148b2..a45c659b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.inout3.page
@@ -34,7 +34,7 @@ def inout3(self, inoutarg):
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>inoutarg</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page
index e47158cb..07169725 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.method.page
@@ -30,7 +30,7 @@ def method(self):
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page
index db56005e..a9d5df4a 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.notrans.page
@@ -30,7 +30,7 @@ def notrans(self):
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>Returns</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page
index 23636478..19b16d58 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.out.page
@@ -34,7 +34,7 @@ def out(self, outarg):
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>outarg</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page
index 7b8e8b91..f1fd6014 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.use_buffer.page
@@ -34,7 +34,7 @@ def use_buffer(self, bytes):
 <terms>
 <item>
 <title><code>self</code></title>
-  <p>a <link xref="GObject.Object"/></p>
+  <p>a <link href="../GObject-2.0/GObject.Object.html">GObject.Object</link></p>
 </item>
 <item>
 <title><code>bytes</code></title>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch.page
index 6d3ec7e8..0f59ac11 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch_full.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.AnnotationObject.watch.page
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<page id="Regress.AnnotationObject.watch_full"
+<page id="Regress.AnnotationObject.watch"
       type="topic"
       style="method"
       xmlns="http://projectmallard.org/1.0/"
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.method.page
index 948cc806..a59df20e 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.method.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.method.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooEnumType" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>int</api:type>
@@ -18,7 +18,7 @@
       </api:arg>
     </api:function>
   </info>
-  <title>Regress.method</title>
+  <title>Regress.FooEnumType.method</title>
   <synopsis><code mime="text/x-python">
 @accepts(Regress.FooEnumType)
 @returns(int)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.returnv.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.returnv.page
index 7b5c4e9b..27bc0c30 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.returnv.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooEnumType.returnv.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooEnumType" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>Regress.FooEnumType</api:type>
@@ -18,7 +18,7 @@
       </api:arg>
     </api:function>
   </info>
-  <title>Regress.returnv</title>
+  <title>Regress.FooEnumType.returnv</title>
   <synopsis><code mime="text/x-python">
 @accepts(int)
 @returns(Regress.FooEnumType)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.quark.page
index 3acb8451..7ff6b1e1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.quark.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooError.quark.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.FooError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
@@ -14,7 +14,7 @@
       <api:name>regress_foo_error_quark</api:name>
     </api:function>
   </info>
-  <title>Regress.quark</title>
+  <title>Regress.FooError.quark</title>
   <synopsis><code mime="text/x-python">
 @returns(GLib.Quark)
 def quark():
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.FooStructPrivate.page b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStructPrivate.page
new file mode 100644
index 00000000..52a15b79
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.FooStructPrivate.page
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<page id="Regress.FooStructPrivate"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.FooStructPrivate</title>
+  <synopsis><code>
+from gi.repository import Regress
+
+foo_struct_private = Regress.FooStructPrivate()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None.page b/tests/scanner/Regress-1.0-Python-expected/Regress.Intset.page
index c21c1b74..030d15b5 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.AnAnonymousUnion.None.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.Intset.page
@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<page id="Regress.AnAnonymousUnion.None"
+<page id="Regress.Intset"
       type="guide"
       style="class"
       xmlns="http://projectmallard.org/1.0/"
@@ -8,13 +8,13 @@
   <info>
     <link xref="index" group="class" type="guide"/>
   </info>
-  <title>Regress.AnAnonymousUnion.None</title>
+  <title>Regress.Intset</title>
   <synopsis><code>
 from gi.repository import Regress
 
-anonymous_union = Regress.None()
+intset = Regress.Intset()
   </code></synopsis>
-
+  <p>Like telepathy-glib's TpIntset.</p>
 
   <links type="topic" ui:expanded="true"
          api:type="function" api:mime="text/python"
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page
index d47bc9ac..832a3dfe 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestABCError.quark.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestABCError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
@@ -14,7 +14,7 @@
       <api:name>regress_test_abc_error_quark</api:name>
     </api:function>
   </info>
-  <title>Regress.quark</title>
+  <title>Regress.TestABCError.quark</title>
   <synopsis><code mime="text/x-python">
 @returns(GLib.Quark)
 def quark():
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedPrivate.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedPrivate.page
new file mode 100644
index 00000000..d47a18cf
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestBoxedPrivate.page
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<page id="Regress.TestBoxedPrivate"
+      type="guide"
+      style="class"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="class" type="guide"/>
+  </info>
+  <title>Regress.TestBoxedPrivate</title>
+  <synopsis><code>
+from gi.repository import Regress
+
+test_boxed_private = Regress.TestBoxedPrivate()
+  </code></synopsis>
+
+
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="constructor" style="linklist">
+    <title>Constructors</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="method" style="linklist">
+    <title>Methods</title>
+  </links>
+  <links type="topic" ui:expanded="true"
+         api:type="function" api:mime="text/python"
+         groups="function" style="linklist">
+    <title>Static Functions</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="field" style="linklist">
+    <title>Fields</title>
+  </links>
+  <links type="topic" ui:expanded="true" groups="#first #default #last" style="linklist">
+    <title>Other</title>
+  </links>
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page
index 162276ed..fd222a4b 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestEnum.param.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestEnum" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>unicode</api:type>
@@ -18,7 +18,7 @@
       </api:arg>
     </api:function>
   </info>
-  <title>Regress.param</title>
+  <title>Regress.TestEnum.param</title>
   <synopsis><code mime="text/x-python">
 @accepts(Regress.TestEnum)
 @returns(unicode)
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page
index 747f149a..379a1ff8 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestError.quark.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
@@ -14,7 +14,7 @@
       <api:name>regress_test_error_quark</api:name>
     </api:function>
   </info>
-  <title>Regress.quark</title>
+  <title>Regress.TestError.quark</title>
   <synopsis><code mime="text/x-python">
 @returns(GLib.Quark)
 def quark():
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page
index 6982f70c..fee709c1 100644
--- a/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.TestOtherError.quark.page
@@ -6,7 +6,7 @@
       xmlns:api="http://projectmallard.org/experimental/api/"
       xmlns:ui="http://projectmallard.org/1.0/ui/">
   <info>
-    <link xref="index" group="function" type="guide"/>
+    <link xref="Regress.TestOtherError" group="function" type="guide"/>
     <api:function>
       <api:returns>
         <api:type>GLib.Quark</api:type>
@@ -14,7 +14,7 @@
       <api:name>regress_test_unconventional_error_quark</api:name>
     </api:function>
   </info>
-  <title>Regress.quark</title>
+  <title>Regress.TestOtherError.quark</title>
   <synopsis><code mime="text/x-python">
 @returns(GLib.Quark)
 def quark():
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_method.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_method.page
new file mode 100644
index 00000000..a97d5502
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_method.page
@@ -0,0 +1,37 @@
+<?xml version="1.0"?>
+<page id="Regress.test_boxeds_not_a_method"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>none</api:type>
+      </api:returns>
+      <api:name>regress_test_boxeds_not_a_method</api:name>
+      <api:arg>
+        <api:type>Regress.TestBoxed</api:type>
+        <api:name>boxed</api:name>
+      </api:arg>
+    </api:function>
+  </info>
+  <title>Regress.test_boxeds_not_a_method</title>
+  <synopsis><code mime="text/x-python">
+@accepts(Regress.TestBoxed)
+@returns(none)
+def test_boxeds_not_a_method(boxed):
+    # Python wrapper for regress_test_boxeds_not_a_method()
+  </code></synopsis>
+
+
+<terms>
+<item>
+<title><code>boxed</code></title>
+
+</item>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_static.page b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_static.page
new file mode 100644
index 00000000..9d7a5f5c
--- /dev/null
+++ b/tests/scanner/Regress-1.0-Python-expected/Regress.test_boxeds_not_a_static.page
@@ -0,0 +1,28 @@
+<?xml version="1.0"?>
+<page id="Regress.test_boxeds_not_a_static"
+      type="topic"
+      style="function"
+      xmlns="http://projectmallard.org/1.0/"
+      xmlns:api="http://projectmallard.org/experimental/api/"
+      xmlns:ui="http://projectmallard.org/1.0/ui/">
+  <info>
+    <link xref="index" group="function" type="guide"/>
+    <api:function>
+      <api:returns>
+        <api:type>none</api:type>
+      </api:returns>
+      <api:name>regress_test_boxeds_not_a_static</api:name>
+    </api:function>
+  </info>
+  <title>Regress.test_boxeds_not_a_static</title>
+  <synopsis><code mime="text/x-python">
+@returns(none)
+def test_boxeds_not_a_static():
+    # Python wrapper for regress_test_boxeds_not_a_static()
+  </code></synopsis>
+
+
+<terms>
+</terms>
+
+</page>
diff --git a/tests/scanner/Regress-1.0-sections-expected.txt b/tests/scanner/Regress-1.0-sections-expected.txt
index 96df7c59..c9ff60a3 100644
--- a/tests/scanner/Regress-1.0-sections-expected.txt
+++ b/tests/scanner/Regress-1.0-sections-expected.txt
@@ -74,6 +74,8 @@ regress_test_async_ready_callback
 regress_test_boolean
 regress_test_boolean_false
 regress_test_boolean_true
+regress_test_boxeds_not_a_method
+regress_test_boxeds_not_a_static
 regress_test_cairo_context_full_return
 regress_test_cairo_context_none_in
 regress_test_cairo_surface_full_out