diff --git a/extractor/dbscheme/tables.go b/extractor/dbscheme/tables.go
index df146c8e4e5..a3fb0993411 100644
--- a/extractor/dbscheme/tables.go
+++ b/extractor/dbscheme/tables.go
@@ -706,7 +706,9 @@ var HasLocationTable = NewTable("has_location",
 // CommentGroupsTable is the table defining comment group entities
 var CommentGroupsTable = NewTable("comment_groups",
 	EntityColumn(CommentGroupType, "id").Key(),
-)
+	EntityColumn(FileType, "parent"),
+	IntColumn("idx"),
+).KeySet("parent", "idx")
 
 // CommentsTable is the table defining comment entities
 var CommentsTable = NewTable("comments",
diff --git a/extractor/extractor.go b/extractor/extractor.go
index 1f878cb813e..4bcbe1421bf 100644
--- a/extractor/extractor.go
+++ b/extractor/extractor.go
@@ -532,8 +532,8 @@ func extractFileNode(tw *trap.Writer, nd *ast.File) {
 		extractDecl(tw, decl, lbl, i)
 	}
 
-	for _, cg := range nd.Comments {
-		extractCommentGroup(tw, cg)
+	for i, cg := range nd.Comments {
+		extractCommentGroup(tw, cg, lbl, i)
 	}
 
 	extractDoc(tw, nd.Doc, lbl)
@@ -548,9 +548,9 @@ func extractDoc(tw *trap.Writer, doc *ast.CommentGroup, elt trap.Label) {
 }
 
 // extractCommentGroup extracts information about a doc comment group
-func extractCommentGroup(tw *trap.Writer, cg *ast.CommentGroup) {
+func extractCommentGroup(tw *trap.Writer, cg *ast.CommentGroup, parent trap.Label, idx int) {
 	lbl := tw.Labeler.LocalID(cg)
-	dbscheme.CommentGroupsTable.Emit(tw, lbl)
+	dbscheme.CommentGroupsTable.Emit(tw, lbl, parent, idx)
 	extractNodeLocation(tw, cg, lbl)
 	for i, c := range cg.List {
 		extractComment(tw, c, lbl, i)
diff --git a/extractor/gomodextractor.go b/extractor/gomodextractor.go
index 77c8520f0cf..62d5e33bf72 100644
--- a/extractor/gomodextractor.go
+++ b/extractor/gomodextractor.go
@@ -144,7 +144,7 @@ func extractGoModComments(tw *trap.Writer, expr modfile.Expr, exprlbl trap.Label
 
 	// extract a pseudo `@commentgroup` for each expr that contains their associated comments
 	grouplbl := tw.Labeler.LocalID(GoModExprCommentWrapper{expr})
-	dbscheme.CommentGroupsTable.Emit(tw, grouplbl)
+	dbscheme.CommentGroupsTable.Emit(tw, grouplbl, tw.Labeler.FileLabel(), 0)
 	dbscheme.DocCommentsTable.Emit(tw, exprlbl, grouplbl)
 
 	var allComments []modfile.Comment
diff --git a/ql/src/go.dbscheme b/ql/src/go.dbscheme
index ee5c327face..bcb9599aba6 100644
--- a/ql/src/go.dbscheme
+++ b/ql/src/go.dbscheme
@@ -49,7 +49,8 @@ containerparent(int parent: @container ref, unique int child: @container ref);
 
 has_location(unique int locatable: @locatable ref, int location: @location ref);
 
-comment_groups(unique int id: @comment_group);
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
 
 comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
 
diff --git a/ql/src/go.dbscheme.stats b/ql/src/go.dbscheme.stats
index c1b9237ef18..90d111d74e7 100644
--- a/ql/src/go.dbscheme.stats
+++ b/ql/src/go.dbscheme.stats
@@ -5,36 +5,404 @@
             <v>0</v>
         </e>
         <e>
-            <k>@comment_group</k>
-            <v>12133</v>
-        </e>
-        <e>
-            <k>@folder</k>
-            <v>223</v>
-        </e>
-        <e>
-            <k>@file</k>
-            <v>523</v>
+            <k>@similarity</k>
+            <v>0</v>
         </e>
         <e>
             <k>@externalDataElement</k>
             <v>0</v>
         </e>
         <e>
-            <k>@similarity</k>
+            <k>@location_default</k>
+            <v>537326</v>
+        </e>
+        <e>
+            <k>@file</k>
+            <v>523</v>
+        </e>
+        <e>
+            <k>@folder</k>
+            <v>222</v>
+        </e>
+        <e>
+            <k>@comment_group</k>
+            <v>12094</v>
+        </e>
+        <e>
+            <k>@slashslashcomment</k>
+            <v>24890</v>
+        </e>
+        <e>
+            <k>@slashstarcomment</k>
+            <v>846</v>
+        </e>
+        <e>
+            <k>@ident</k>
+            <v>237281</v>
+        </e>
+        <e>
+            <k>@ellipsis</k>
+            <v>141</v>
+        </e>
+        <e>
+            <k>@intlit</k>
+            <v>7680</v>
+        </e>
+        <e>
+            <k>@floatlit</k>
+            <v>27</v>
+        </e>
+        <e>
+            <k>@charlit</k>
+            <v>838</v>
+        </e>
+        <e>
+            <k>@stringlit</k>
+            <v>24889</v>
+        </e>
+        <e>
+            <k>@funclit</k>
+            <v>678</v>
+        </e>
+        <e>
+            <k>@compositelit</k>
+            <v>2703</v>
+        </e>
+        <e>
+            <k>@parenexpr</k>
+            <v>342</v>
+        </e>
+        <e>
+            <k>@selectorexpr</k>
+            <v>54345</v>
+        </e>
+        <e>
+            <k>@indexexpr</k>
+            <v>4580</v>
+        </e>
+        <e>
+            <k>@sliceexpr</k>
+            <v>835</v>
+        </e>
+        <e>
+            <k>@typeassertexpr</k>
+            <v>2127</v>
+        </e>
+        <e>
+            <k>@callorconversionexpr</k>
+            <v>32032</v>
+        </e>
+        <e>
+            <k>@starexpr</k>
+            <v>10359</v>
+        </e>
+        <e>
+            <k>@keyvalueexpr</k>
+            <v>5616</v>
+        </e>
+        <e>
+            <k>@arraytypeexpr</k>
+            <v>3464</v>
+        </e>
+        <e>
+            <k>@structtypeexpr</k>
+            <v>1207</v>
+        </e>
+        <e>
+            <k>@functypeexpr</k>
+            <v>6015</v>
+        </e>
+        <e>
+            <k>@interfacetypeexpr</k>
+            <v>509</v>
+        </e>
+        <e>
+            <k>@maptypeexpr</k>
+            <v>1013</v>
+        </e>
+        <e>
+            <k>@minusexpr</k>
+            <v>270</v>
+        </e>
+        <e>
+            <k>@notexpr</k>
+            <v>1190</v>
+        </e>
+        <e>
+            <k>@complementexpr</k>
+            <v>21</v>
+        </e>
+        <e>
+            <k>@addressexpr</k>
+            <v>1738</v>
+        </e>
+        <e>
+            <k>@arrowexpr</k>
+            <v>92</v>
+        </e>
+        <e>
+            <k>@lorexpr</k>
+            <v>612</v>
+        </e>
+        <e>
+            <k>@landexpr</k>
+            <v>1234</v>
+        </e>
+        <e>
+            <k>@eqlexpr</k>
+            <v>3244</v>
+        </e>
+        <e>
+            <k>@neqexpr</k>
+            <v>4103</v>
+        </e>
+        <e>
+            <k>@lssexpr</k>
+            <v>784</v>
+        </e>
+        <e>
+            <k>@leqexpr</k>
+            <v>248</v>
+        </e>
+        <e>
+            <k>@gtrexpr</k>
+            <v>618</v>
+        </e>
+        <e>
+            <k>@geqexpr</k>
+            <v>270</v>
+        </e>
+        <e>
+            <k>@addexpr</k>
+            <v>1272</v>
+        </e>
+        <e>
+            <k>@subexpr</k>
+            <v>556</v>
+        </e>
+        <e>
+            <k>@orexpr</k>
+            <v>146</v>
+        </e>
+        <e>
+            <k>@xorexpr</k>
+            <v>14</v>
+        </e>
+        <e>
+            <k>@mulexpr</k>
+            <v>207</v>
+        </e>
+        <e>
+            <k>@quoexpr</k>
+            <v>53</v>
+        </e>
+        <e>
+            <k>@remexpr</k>
+            <v>24</v>
+        </e>
+        <e>
+            <k>@shlexpr</k>
+            <v>164</v>
+        </e>
+        <e>
+            <k>@shrexpr</k>
+            <v>57</v>
+        </e>
+        <e>
+            <k>@andexpr</k>
+            <v>235</v>
+        </e>
+        <e>
+            <k>@andnotexpr</k>
+            <v>19</v>
+        </e>
+        <e>
+            <k>@sendchantypeexpr</k>
+            <v>7</v>
+        </e>
+        <e>
+            <k>@recvchantypeexpr</k>
+            <v>9</v>
+        </e>
+        <e>
+            <k>@sendrcvchantypeexpr</k>
+            <v>101</v>
+        </e>
+        <e>
+            <k>@badexpr</k>
+            <v>0</v>
+        </e>
+        <e>
+            <k>@imaglit</k>
+            <v>0</v>
+        </e>
+        <e>
+            <k>@plusexpr</k>
+            <v>0</v>
+        </e>
+        <e>
+            <k>@derefexpr</k>
             <v>0</v>
         </e>
         <e>
             <k>@field</k>
             <v>19974</v>
         </e>
+        <e>
+            <k>@declstmt</k>
+            <v>1452</v>
+        </e>
+        <e>
+            <k>@labeledstmt</k>
+            <v>49</v>
+        </e>
+        <e>
+            <k>@exprstmt</k>
+            <v>7604</v>
+        </e>
+        <e>
+            <k>@sendstmt</k>
+            <v>69</v>
+        </e>
+        <e>
+            <k>@incstmt</k>
+            <v>614</v>
+        </e>
+        <e>
+            <k>@decstmt</k>
+            <v>71</v>
+        </e>
+        <e>
+            <k>@gostmt</k>
+            <v>72</v>
+        </e>
+        <e>
+            <k>@deferstmt</k>
+            <v>358</v>
+        </e>
+        <e>
+            <k>@returnstmt</k>
+            <v>9225</v>
+        </e>
+        <e>
+            <k>@breakstmt</k>
+            <v>301</v>
+        </e>
+        <e>
+            <k>@continuestmt</k>
+            <v>606</v>
+        </e>
+        <e>
+            <k>@gotostmt</k>
+            <v>8</v>
+        </e>
+        <e>
+            <k>@fallthroughstmt</k>
+            <v>7</v>
+        </e>
+        <e>
+            <k>@blockstmt</k>
+            <v>19356</v>
+        </e>
+        <e>
+            <k>@ifstmt</k>
+            <v>9726</v>
+        </e>
+        <e>
+            <k>@caseclause</k>
+            <v>3476</v>
+        </e>
+        <e>
+            <k>@exprswitchstmt</k>
+            <v>378</v>
+        </e>
+        <e>
+            <k>@typeswitchstmt</k>
+            <v>400</v>
+        </e>
+        <e>
+            <k>@commclause</k>
+            <v>72</v>
+        </e>
+        <e>
+            <k>@selectstmt</k>
+            <v>35</v>
+        </e>
+        <e>
+            <k>@forstmt</k>
+            <v>654</v>
+        </e>
+        <e>
+            <k>@rangestmt</k>
+            <v>2135</v>
+        </e>
+        <e>
+            <k>@assignstmt</k>
+            <v>7477</v>
+        </e>
+        <e>
+            <k>@definestmt</k>
+            <v>9511</v>
+        </e>
+        <e>
+            <k>@addassignstmt</k>
+            <v>223</v>
+        </e>
+        <e>
+            <k>@subassignstmt</k>
+            <v>18</v>
+        </e>
+        <e>
+            <k>@mulassignstmt</k>
+            <v>5</v>
+        </e>
+        <e>
+            <k>@quoassignstmt</k>
+            <v>3</v>
+        </e>
+        <e>
+            <k>@orassignstmt</k>
+            <v>63</v>
+        </e>
+        <e>
+            <k>@xorassignstmt</k>
+            <v>3</v>
+        </e>
+        <e>
+            <k>@shlassignstmt</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@shrassignstmt</k>
+            <v>3</v>
+        </e>
+        <e>
+            <k>@andnotassignstmt</k>
+            <v>3</v>
+        </e>
+        <e>
+            <k>@badstmt</k>
+            <v>0</v>
+        </e>
+        <e>
+            <k>@emptystmt</k>
+            <v>0</v>
+        </e>
+        <e>
+            <k>@remassignstmt</k>
+            <v>0</v>
+        </e>
+        <e>
+            <k>@andassignstmt</k>
+            <v>0</v>
+        </e>
         <e>
             <k>@importdecl</k>
             <v>479</v>
         </e>
         <e>
             <k>@constdecl</k>
-            <v>280</v>
+            <v>278</v>
         </e>
         <e>
             <k>@typedecl</k>
@@ -52,21 +420,13 @@
             <k>@baddecl</k>
             <v>0</v>
         </e>
-        <e>
-            <k>@slashslashcomment</k>
-            <v>24891</v>
-        </e>
-        <e>
-            <k>@slashstarcomment</k>
-            <v>846</v>
-        </e>
         <e>
             <k>@importspec</k>
-            <v>3468</v>
+            <v>3466</v>
         </e>
         <e>
             <k>@valuespec</k>
-            <v>3056</v>
+            <v>3054</v>
         </e>
         <e>
             <k>@typespec</k>
@@ -78,19 +438,19 @@
         </e>
         <e>
             <k>@packagescope</k>
-            <v>340</v>
+            <v>342</v>
         </e>
         <e>
             <k>@localscope</k>
-            <v>36428</v>
+            <v>36424</v>
         </e>
         <e>
             <k>@pkgobject</k>
-            <v>3468</v>
+            <v>3466</v>
         </e>
         <e>
             <k>@decltypeobject</k>
-            <v>3499</v>
+            <v>3526</v>
         </e>
         <e>
             <k>@builtintypeobject</k>
@@ -98,7 +458,7 @@
         </e>
         <e>
             <k>@declconstobject</k>
-            <v>8488</v>
+            <v>8262</v>
         </e>
         <e>
             <k>@builtinconstobject</k>
@@ -106,11 +466,11 @@
         </e>
         <e>
             <k>@declvarobject</k>
-            <v>50364</v>
+            <v>50424</v>
         </e>
         <e>
             <k>@declfunctionobject</k>
-            <v>17254</v>
+            <v>17441</v>
         </e>
         <e>
             <k>@builtinfunctionobject</k>
@@ -222,11 +582,11 @@
         </e>
         <e>
             <k>@arraytype</k>
-            <v>292</v>
+            <v>284</v>
         </e>
         <e>
             <k>@slicetype</k>
-            <v>617</v>
+            <v>620</v>
         </e>
         <e>
             <k>@structtype</k>
@@ -238,7 +598,7 @@
         </e>
         <e>
             <k>@interfacetype</k>
-            <v>232</v>
+            <v>237</v>
         </e>
         <e>
             <k>@tupletype</k>
@@ -246,11 +606,11 @@
         </e>
         <e>
             <k>@signaturetype</k>
-            <v>7771</v>
+            <v>7753</v>
         </e>
         <e>
             <k>@maptype</k>
-            <v>416</v>
+            <v>417</v>
         </e>
         <e>
             <k>@sendchantype</k>
@@ -266,163 +626,15 @@
         </e>
         <e>
             <k>@namedtype</k>
-            <v>3471</v>
+            <v>3488</v>
         </e>
         <e>
             <k>@complexliteraltype</k>
             <v>0</v>
         </e>
-        <e>
-            <k>@declstmt</k>
-            <v>1454</v>
-        </e>
-        <e>
-            <k>@labeledstmt</k>
-            <v>49</v>
-        </e>
-        <e>
-            <k>@exprstmt</k>
-            <v>7605</v>
-        </e>
-        <e>
-            <k>@sendstmt</k>
-            <v>69</v>
-        </e>
-        <e>
-            <k>@incstmt</k>
-            <v>614</v>
-        </e>
-        <e>
-            <k>@decstmt</k>
-            <v>71</v>
-        </e>
-        <e>
-            <k>@gostmt</k>
-            <v>72</v>
-        </e>
-        <e>
-            <k>@deferstmt</k>
-            <v>358</v>
-        </e>
-        <e>
-            <k>@returnstmt</k>
-            <v>9225</v>
-        </e>
-        <e>
-            <k>@breakstmt</k>
-            <v>301</v>
-        </e>
-        <e>
-            <k>@continuestmt</k>
-            <v>606</v>
-        </e>
-        <e>
-            <k>@gotostmt</k>
-            <v>8</v>
-        </e>
-        <e>
-            <k>@fallthroughstmt</k>
-            <v>7</v>
-        </e>
-        <e>
-            <k>@blockstmt</k>
-            <v>19358</v>
-        </e>
-        <e>
-            <k>@ifstmt</k>
-            <v>9728</v>
-        </e>
-        <e>
-            <k>@caseclause</k>
-            <v>3476</v>
-        </e>
-        <e>
-            <k>@exprswitchstmt</k>
-            <v>378</v>
-        </e>
-        <e>
-            <k>@typeswitchstmt</k>
-            <v>400</v>
-        </e>
-        <e>
-            <k>@commclause</k>
-            <v>72</v>
-        </e>
-        <e>
-            <k>@selectstmt</k>
-            <v>35</v>
-        </e>
-        <e>
-            <k>@forstmt</k>
-            <v>654</v>
-        </e>
-        <e>
-            <k>@rangestmt</k>
-            <v>2135</v>
-        </e>
-        <e>
-            <k>@assignstmt</k>
-            <v>7478</v>
-        </e>
-        <e>
-            <k>@definestmt</k>
-            <v>9514</v>
-        </e>
-        <e>
-            <k>@addassignstmt</k>
-            <v>223</v>
-        </e>
-        <e>
-            <k>@subassignstmt</k>
-            <v>18</v>
-        </e>
-        <e>
-            <k>@mulassignstmt</k>
-            <v>5</v>
-        </e>
-        <e>
-            <k>@quoassignstmt</k>
-            <v>3</v>
-        </e>
-        <e>
-            <k>@orassignstmt</k>
-            <v>63</v>
-        </e>
-        <e>
-            <k>@xorassignstmt</k>
-            <v>3</v>
-        </e>
-        <e>
-            <k>@shlassignstmt</k>
-            <v>2</v>
-        </e>
-        <e>
-            <k>@shrassignstmt</k>
-            <v>3</v>
-        </e>
-        <e>
-            <k>@andnotassignstmt</k>
-            <v>3</v>
-        </e>
-        <e>
-            <k>@badstmt</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@emptystmt</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@remassignstmt</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@andassignstmt</k>
-            <v>0</v>
-        </e>
         <e>
             <k>@package</k>
-            <v>340</v>
+            <v>342</v>
         </e>
         <e>
             <k>@modcommentblock</k>
@@ -460,218 +672,6 @@
             <k>@typeerror</k>
             <v>0</v>
         </e>
-        <e>
-            <k>@ident</k>
-            <v>237316</v>
-        </e>
-        <e>
-            <k>@ellipsis</k>
-            <v>141</v>
-        </e>
-        <e>
-            <k>@intlit</k>
-            <v>7683</v>
-        </e>
-        <e>
-            <k>@floatlit</k>
-            <v>27</v>
-        </e>
-        <e>
-            <k>@charlit</k>
-            <v>838</v>
-        </e>
-        <e>
-            <k>@stringlit</k>
-            <v>24892</v>
-        </e>
-        <e>
-            <k>@funclit</k>
-            <v>678</v>
-        </e>
-        <e>
-            <k>@compositelit</k>
-            <v>2704</v>
-        </e>
-        <e>
-            <k>@parenexpr</k>
-            <v>343</v>
-        </e>
-        <e>
-            <k>@selectorexpr</k>
-            <v>54353</v>
-        </e>
-        <e>
-            <k>@indexexpr</k>
-            <v>4581</v>
-        </e>
-        <e>
-            <k>@sliceexpr</k>
-            <v>836</v>
-        </e>
-        <e>
-            <k>@typeassertexpr</k>
-            <v>2127</v>
-        </e>
-        <e>
-            <k>@callorconversionexpr</k>
-            <v>32041</v>
-        </e>
-        <e>
-            <k>@starexpr</k>
-            <v>10360</v>
-        </e>
-        <e>
-            <k>@keyvalueexpr</k>
-            <v>5616</v>
-        </e>
-        <e>
-            <k>@arraytypeexpr</k>
-            <v>3465</v>
-        </e>
-        <e>
-            <k>@structtypeexpr</k>
-            <v>1207</v>
-        </e>
-        <e>
-            <k>@functypeexpr</k>
-            <v>6015</v>
-        </e>
-        <e>
-            <k>@interfacetypeexpr</k>
-            <v>509</v>
-        </e>
-        <e>
-            <k>@maptypeexpr</k>
-            <v>1013</v>
-        </e>
-        <e>
-            <k>@minusexpr</k>
-            <v>270</v>
-        </e>
-        <e>
-            <k>@notexpr</k>
-            <v>1190</v>
-        </e>
-        <e>
-            <k>@complementexpr</k>
-            <v>21</v>
-        </e>
-        <e>
-            <k>@addressexpr</k>
-            <v>1739</v>
-        </e>
-        <e>
-            <k>@arrowexpr</k>
-            <v>92</v>
-        </e>
-        <e>
-            <k>@lorexpr</k>
-            <v>612</v>
-        </e>
-        <e>
-            <k>@landexpr</k>
-            <v>1234</v>
-        </e>
-        <e>
-            <k>@eqlexpr</k>
-            <v>3244</v>
-        </e>
-        <e>
-            <k>@neqexpr</k>
-            <v>4103</v>
-        </e>
-        <e>
-            <k>@lssexpr</k>
-            <v>785</v>
-        </e>
-        <e>
-            <k>@leqexpr</k>
-            <v>248</v>
-        </e>
-        <e>
-            <k>@gtrexpr</k>
-            <v>619</v>
-        </e>
-        <e>
-            <k>@geqexpr</k>
-            <v>270</v>
-        </e>
-        <e>
-            <k>@addexpr</k>
-            <v>1272</v>
-        </e>
-        <e>
-            <k>@subexpr</k>
-            <v>557</v>
-        </e>
-        <e>
-            <k>@orexpr</k>
-            <v>146</v>
-        </e>
-        <e>
-            <k>@xorexpr</k>
-            <v>14</v>
-        </e>
-        <e>
-            <k>@mulexpr</k>
-            <v>207</v>
-        </e>
-        <e>
-            <k>@quoexpr</k>
-            <v>53</v>
-        </e>
-        <e>
-            <k>@remexpr</k>
-            <v>24</v>
-        </e>
-        <e>
-            <k>@shlexpr</k>
-            <v>164</v>
-        </e>
-        <e>
-            <k>@shrexpr</k>
-            <v>57</v>
-        </e>
-        <e>
-            <k>@andexpr</k>
-            <v>235</v>
-        </e>
-        <e>
-            <k>@andnotexpr</k>
-            <v>19</v>
-        </e>
-        <e>
-            <k>@sendchantypeexpr</k>
-            <v>7</v>
-        </e>
-        <e>
-            <k>@recvchantypeexpr</k>
-            <v>9</v>
-        </e>
-        <e>
-            <k>@sendrcvchantypeexpr</k>
-            <v>101</v>
-        </e>
-        <e>
-            <k>@badexpr</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@imaglit</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@plusexpr</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@derefexpr</k>
-            <v>0</v>
-        </e>
-        <e>
-            <k>@location_default</k>
-            <v>537406</v>
-        </e>
     </typesizes>
     <stats>
         <relation>
@@ -1358,11 +1358,11 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>537406</cardinality>
+            <cardinality>537326</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>537406</v>
+                    <v>537326</v>
                 </e>
                 <e>
                     <k>file</k>
@@ -1396,7 +1396,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>537406</v>
+                                    <v>537326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1412,7 +1412,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>537406</v>
+                                    <v>537326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1428,7 +1428,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>537406</v>
+                                    <v>537326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1444,7 +1444,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>537406</v>
+                                    <v>537326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1460,7 +1460,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>537406</v>
+                                    <v>537326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1476,17 +1476,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>30</b>
-                                    <v>40</v>
+                                    <v>41</v>
                                 </b>
                                 <b>
                                     <a>30</a>
-                                    <b>121</b>
+                                    <b>122</b>
                                     <v>40</v>
                                 </b>
                                 <b>
-                                    <a>121</a>
+                                    <a>122</a>
                                     <b>211</b>
-                                    <v>41</v>
+                                    <v>40</v>
                                 </b>
                                 <b>
                                     <a>211</a>
@@ -1552,67 +1552,67 @@
                                 <b>
                                     <a>2</a>
                                     <b>12</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>26</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>26</a>
-                                    <b>45</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>45</a>
-                                    <b>61</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>61</a>
-                                    <b>75</b>
-                                    <v>41</v>
-                                </b>
-                                <b>
-                                    <a>75</a>
-                                    <b>93</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>93</a>
-                                    <b>120</b>
+                                    <a>12</a>
+                                    <b>27</b>
+                                    <v>42</v>
+                                </b>
+                                <b>
+                                    <a>27</a>
+                                    <b>46</b>
+                                    <v>40</v>
+                                </b>
+                                <b>
+                                    <a>46</a>
+                                    <b>63</b>
+                                    <v>43</v>
+                                </b>
+                                <b>
+                                    <a>63</a>
+                                    <b>79</b>
+                                    <v>40</v>
+                                </b>
+                                <b>
+                                    <a>79</a>
+                                    <b>94</b>
+                                    <v>40</v>
+                                </b>
+                                <b>
+                                    <a>95</a>
+                                    <b>121</b>
+                                    <v>40</v>
+                                </b>
+                                <b>
+                                    <a>121</a>
+                                    <b>154</b>
+                                    <v>40</v>
+                                </b>
+                                <b>
+                                    <a>154</a>
+                                    <b>191</b>
+                                    <v>40</v>
+                                </b>
+                                <b>
+                                    <a>193</a>
+                                    <b>250</b>
                                     <v>41</v>
                                 </b>
                                 <b>
-                                    <a>120</a>
-                                    <b>153</b>
+                                    <a>254</a>
+                                    <b>337</b>
                                     <v>40</v>
                                 </b>
                                 <b>
-                                    <a>153</a>
-                                    <b>190</b>
+                                    <a>340</a>
+                                    <b>558</b>
                                     <v>40</v>
                                 </b>
                                 <b>
-                                    <a>190</a>
-                                    <b>247</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>249</a>
-                                    <b>325</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>336</a>
-                                    <b>544</b>
-                                    <v>40</v>
-                                </b>
-                                <b>
-                                    <a>554</a>
+                                    <a>571</a>
                                     <b>10233</b>
-                                    <v>37</v>
+                                    <v>35</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1632,13 +1632,13 @@
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>35</b>
-                                    <v>41</v>
+                                    <b>34</b>
+                                    <v>40</v>
                                 </b>
                                 <b>
-                                    <a>35</a>
+                                    <a>34</a>
                                     <b>46</b>
-                                    <v>44</v>
+                                    <v>45</v>
                                 </b>
                                 <b>
                                     <a>46</a>
@@ -1704,12 +1704,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>40</v>
+                                    <v>41</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>32</b>
-                                    <v>44</v>
+                                    <v>43</v>
                                 </b>
                                 <b>
                                     <a>32</a>
@@ -1780,7 +1780,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>18</b>
-                                    <v>40</v>
+                                    <v>41</v>
                                 </b>
                                 <b>
                                     <a>19</a>
@@ -1790,7 +1790,7 @@
                                 <b>
                                     <a>46</a>
                                     <b>59</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                                 <b>
                                     <a>59</a>
@@ -1989,12 +1989,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>779</v>
+                                    <v>778</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>21</b>
-                                    <v>795</v>
+                                    <v>796</v>
                                 </b>
                                 <b>
                                     <a>21</a>
@@ -2095,7 +2095,7 @@
                                 </b>
                                 <b>
                                     <a>773</a>
-                                    <b>1790</b>
+                                    <b>1789</b>
                                     <v>16</v>
                                 </b>
                                 <b>
@@ -2105,7 +2105,7 @@
                                 </b>
                                 <b>
                                     <a>4029</a>
-                                    <b>8601</b>
+                                    <b>8598</b>
                                     <v>16</v>
                                 </b>
                                 <b>
@@ -2115,7 +2115,7 @@
                                 </b>
                                 <b>
                                     <a>27989</a>
-                                    <b>55558</b>
+                                    <b>55545</b>
                                     <v>3</v>
                                 </b>
                             </bs>
@@ -2165,7 +2165,7 @@
                                     <v>16</v>
                                 </b>
                                 <b>
-                                    <a>204</a>
+                                    <a>203</a>
                                     <b>300</b>
                                     <v>16</v>
                                 </b>
@@ -2180,8 +2180,8 @@
                                     <v>16</v>
                                 </b>
                                 <b>
-                                    <a>432</a>
-                                    <b>459</b>
+                                    <a>431</a>
+                                    <b>458</b>
                                     <v>16</v>
                                 </b>
                                 <b>
@@ -2640,37 +2640,37 @@
                                 </b>
                                 <b>
                                     <a>37</a>
-                                    <b>91</b>
+                                    <b>92</b>
                                     <v>20</v>
                                 </b>
                                 <b>
                                     <a>94</a>
-                                    <b>259</b>
+                                    <b>260</b>
                                     <v>20</v>
                                 </b>
                                 <b>
                                     <a>287</a>
-                                    <b>915</b>
+                                    <b>913</b>
                                     <v>20</v>
                                 </b>
                                 <b>
-                                    <a>1002</a>
+                                    <a>1001</a>
                                     <b>2526</b>
                                     <v>20</v>
                                 </b>
                                 <b>
                                     <a>2555</a>
-                                    <b>5288</b>
+                                    <b>5281</b>
                                     <v>20</v>
                                 </b>
                                 <b>
                                     <a>5733</a>
-                                    <b>10001</b>
+                                    <b>10000</b>
                                     <v>20</v>
                                 </b>
                                 <b>
                                     <a>10080</a>
-                                    <b>20361</b>
+                                    <b>20357</b>
                                     <v>19</v>
                                 </b>
                             </bs>
@@ -2705,34 +2705,34 @@
                                     <v>20</v>
                                 </b>
                                 <b>
-                                    <a>41</a>
+                                    <a>40</a>
                                     <b>100</b>
                                     <v>20</v>
                                 </b>
                                 <b>
-                                    <a>102</a>
+                                    <a>103</a>
                                     <b>221</b>
                                     <v>20</v>
                                 </b>
                                 <b>
-                                    <a>243</a>
+                                    <a>242</a>
                                     <b>370</b>
                                     <v>20</v>
                                 </b>
                                 <b>
                                     <a>371</a>
-                                    <b>430</b>
+                                    <b>429</b>
                                     <v>20</v>
                                 </b>
                                 <b>
                                     <a>430</a>
                                     <b>453</b>
-                                    <v>21</v>
+                                    <v>22</v>
                                 </b>
                                 <b>
                                     <a>453</a>
                                     <b>524</b>
-                                    <v>20</v>
+                                    <v>19</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2766,13 +2766,13 @@
                                     <v>20</v>
                                 </b>
                                 <b>
-                                    <a>54</a>
+                                    <a>55</a>
                                     <b>144</b>
                                     <v>20</v>
                                 </b>
                                 <b>
                                     <a>152</a>
-                                    <b>414</b>
+                                    <b>413</b>
                                     <v>20</v>
                                 </b>
                                 <b>
@@ -2893,13 +2893,13 @@
                                     <v>20</v>
                                 </b>
                                 <b>
-                                    <a>53</a>
+                                    <a>54</a>
                                     <b>142</b>
                                     <v>20</v>
                                 </b>
                                 <b>
                                     <a>151</a>
-                                    <b>407</b>
+                                    <b>406</b>
                                     <v>20</v>
                                 </b>
                                 <b>
@@ -3008,12 +3008,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>183</v>
+                                    <v>184</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>74</v>
+                                    <v>73</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3039,12 +3039,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>187</v>
+                                    <v>188</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>82</v>
+                                    <v>81</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3070,12 +3070,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>188</v>
+                                    <v>189</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79</v>
+                                    <v>78</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3101,12 +3101,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>252</v>
+                                    <v>253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>65</v>
+                                    <v>64</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3132,12 +3132,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>256</v>
+                                    <v>257</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>67</v>
+                                    <v>66</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3158,12 +3158,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>259</v>
+                                    <v>260</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>63</v>
+                                    <v>62</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3214,12 +3214,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>10</b>
-                                    <v>12</v>
+                                    <v>13</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>31</b>
-                                    <v>12</v>
+                                    <v>11</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3259,13 +3259,13 @@
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>10</b>
-                                    <v>13</v>
+                                    <b>9</b>
+                                    <v>11</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
+                                    <a>9</a>
                                     <b>25</b>
-                                    <v>10</v>
+                                    <v>12</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3704,15 +3704,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>223</cardinality>
+            <cardinality>222</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>223</v>
+                    <v>222</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>223</v>
+                    <v>222</v>
                 </e>
                 <e>
                     <k>simple</k>
@@ -3730,7 +3730,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>223</v>
+                                    <v>222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3746,7 +3746,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>223</v>
+                                    <v>222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3762,7 +3762,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>223</v>
+                                    <v>222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3778,7 +3778,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>223</v>
+                                    <v>222</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3794,12 +3794,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>163</v>
+                                    <v>164</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>19</v>
+                                    <v>18</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3820,12 +3820,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>163</v>
+                                    <v>164</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>19</v>
+                                    <v>18</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3840,15 +3840,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>745</cardinality>
+            <cardinality>744</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>223</v>
+                    <v>222</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>745</v>
+                    <v>744</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3862,7 +3862,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>127</v>
+                                    <v>126</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -3908,7 +3908,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>745</v>
+                                    <v>744</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3918,15 +3918,15 @@
         </relation>
         <relation>
             <name>has_location</name>
-            <cardinality>599392</cardinality>
+            <cardinality>599313</cardinality>
             <columnsizes>
                 <e>
                     <k>locatable</k>
-                    <v>599392</v>
+                    <v>599313</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>537406</v>
+                    <v>537326</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3940,7 +3940,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599392</v>
+                                    <v>599313</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3956,12 +3956,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>475735</v>
+                                    <v>475654</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>61627</v>
+                                    <v>61628</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -3976,22 +3976,307 @@
         </relation>
         <relation>
             <name>comment_groups</name>
-            <cardinality>12133</cardinality>
+            <cardinality>12094</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12133</v>
+                    <v>12094</v>
+                </e>
+                <e>
+                    <k>parent</k>
+                    <v>514</v>
+                </e>
+                <e>
+                    <k>idx</k>
+                    <v>720</v>
                 </e>
             </columnsizes>
-            <dependencies/>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>12094</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>id</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>12094</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>47</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>45</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>33</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>27</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>47</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>13</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>17</b>
+                                    <v>47</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>23</b>
+                                    <v>40</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>29</b>
+                                    <v>40</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>38</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>38</a>
+                                    <b>70</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>70</a>
+                                    <b>721</b>
+                                    <v>37</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>parent</src>
+                    <trg>idx</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>49</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>45</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>32</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>27</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>38</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>47</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>13</b>
+                                    <v>34</v>
+                                </b>
+                                <b>
+                                    <a>13</a>
+                                    <b>17</b>
+                                    <v>47</v>
+                                </b>
+                                <b>
+                                    <a>17</a>
+                                    <b>23</b>
+                                    <v>40</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>29</b>
+                                    <v>40</v>
+                                </b>
+                                <b>
+                                    <a>29</a>
+                                    <b>38</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>38</a>
+                                    <b>70</b>
+                                    <v>39</v>
+                                </b>
+                                <b>
+                                    <a>70</a>
+                                    <b>721</b>
+                                    <v>37</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>429</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>53</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>66</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>16</b>
+                                    <v>57</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>44</b>
+                                    <v>54</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>311</b>
+                                    <v>54</v>
+                                </b>
+                                <b>
+                                    <a>323</a>
+                                    <b>521</b>
+                                    <v>7</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>idx</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>429</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>53</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>8</b>
+                                    <v>66</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>16</b>
+                                    <v>57</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>44</b>
+                                    <v>54</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>311</b>
+                                    <v>54</v>
+                                </b>
+                                <b>
+                                    <a>323</a>
+                                    <b>515</b>
+                                    <v>7</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>25737</cardinality>
+            <cardinality>25736</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25737</v>
+                    <v>25736</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -4021,7 +4306,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25737</v>
+                                    <v>25736</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4037,7 +4322,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25737</v>
+                                    <v>25736</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4053,7 +4338,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25737</v>
+                                    <v>25736</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4069,7 +4354,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25737</v>
+                                    <v>25736</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4088,8 +4373,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>24891</a>
-                                    <b>24892</b>
+                                    <a>24890</a>
+                                    <b>24891</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -4169,12 +4454,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7837</v>
+                                    <v>7838</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1789</v>
+                                    <v>1788</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -4226,12 +4511,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7837</v>
+                                    <v>7838</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1789</v>
+                                    <v>1788</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -4262,12 +4547,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7837</v>
+                                    <v>7838</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1819</v>
+                                    <v>1818</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -4585,15 +4870,15 @@
         </relation>
         <relation>
             <name>doc_comments</name>
-            <cardinality>4380</cardinality>
+            <cardinality>4341</cardinality>
             <columnsizes>
                 <e>
                     <k>node</k>
-                    <v>4380</v>
+                    <v>4341</v>
                 </e>
                 <e>
                     <k>comment</k>
-                    <v>4380</v>
+                    <v>4341</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -4607,7 +4892,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4380</v>
+                                    <v>4341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4623,7 +4908,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4380</v>
+                                    <v>4341</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4633,11 +4918,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>414037</cardinality>
+            <cardinality>413969</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>414037</v>
+                    <v>413969</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -4645,7 +4930,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>219324</v>
+                    <v>219286</v>
                 </e>
                 <e>
                     <k>idx</k>
@@ -4663,7 +4948,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414037</v>
+                                    <v>413969</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4679,7 +4964,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414037</v>
+                                    <v>413969</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4695,7 +4980,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414037</v>
+                                    <v>413969</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4730,12 +5015,12 @@
                                 </b>
                                 <b>
                                     <a>248</a>
-                                    <b>344</b>
+                                    <b>343</b>
                                     <v>4</v>
                                 </b>
                                 <b>
                                     <a>509</a>
-                                    <b>620</b>
+                                    <b>619</b>
                                     <v>4</v>
                                 </b>
                                 <b>
@@ -4750,22 +5035,22 @@
                                 </b>
                                 <b>
                                     <a>1272</a>
-                                    <b>2705</b>
+                                    <b>2704</b>
                                     <v>4</v>
                                 </b>
                                 <b>
                                     <a>3244</a>
-                                    <b>4582</b>
+                                    <b>4581</b>
                                     <v>4</v>
                                 </b>
                                 <b>
                                     <a>5616</a>
-                                    <b>10361</b>
+                                    <b>10360</b>
                                     <v>4</v>
                                 </b>
                                 <b>
-                                    <a>24892</a>
-                                    <b>237317</b>
+                                    <a>24889</a>
+                                    <b>237282</b>
                                     <v>4</v>
                                 </b>
                             </bs>
@@ -4801,7 +5086,7 @@
                                 </b>
                                 <b>
                                     <a>233</a>
-                                    <b>324</b>
+                                    <b>323</b>
                                     <v>4</v>
                                 </b>
                                 <b>
@@ -4811,7 +5096,7 @@
                                 </b>
                                 <b>
                                     <a>676</a>
-                                    <b>790</b>
+                                    <b>789</b>
                                     <v>4</v>
                                 </b>
                                 <b>
@@ -4825,18 +5110,18 @@
                                     <v>4</v>
                                 </b>
                                 <b>
-                                    <a>2582</a>
+                                    <a>2581</a>
                                     <b>3985</b>
                                     <v>4</v>
                                 </b>
                                 <b>
-                                    <a>4252</a>
-                                    <b>10115</b>
+                                    <a>4251</a>
+                                    <b>10114</b>
                                     <v>4</v>
                                 </b>
                                 <b>
-                                    <a>14086</a>
-                                    <b>154744</b>
+                                    <a>14083</a>
+                                    <b>154721</b>
                                     <v>4</v>
                                 </b>
                             </bs>
@@ -4914,17 +5199,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65804</v>
+                                    <v>65795</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133334</v>
+                                    <v>133306</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>17889</v>
+                                    <v>17888</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -4945,17 +5230,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137263</v>
+                                    <v>137240</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>75813</v>
+                                    <v>75799</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>6248</v>
+                                    <v>6247</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4971,17 +5256,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65804</v>
+                                    <v>65795</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>133334</v>
+                                    <v>133306</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>17889</v>
+                                    <v>17888</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -5016,7 +5301,7 @@
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>180006</b>
+                                    <b>179978</b>
                                     <v>288</v>
                                 </b>
                             </bs>
@@ -5073,7 +5358,7 @@
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>180006</b>
+                                    <b>179978</b>
                                     <v>288</v>
                                 </b>
                             </bs>
@@ -5084,19 +5369,19 @@
         </relation>
         <relation>
             <name>literals</name>
-            <cardinality>270756</cardinality>
+            <cardinality>270715</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>270756</v>
+                    <v>270715</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>25795</v>
+                    <v>25793</v>
                 </e>
                 <e>
                     <k>raw</k>
-                    <v>27594</v>
+                    <v>27591</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5110,7 +5395,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270756</v>
+                                    <v>270715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5126,7 +5411,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270756</v>
+                                    <v>270715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5147,22 +5432,22 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3291</v>
+                                    <v>3292</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1783</v>
+                                    <v>1781</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1931</v>
+                                    <v>1934</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>1968</v>
+                                    <v>1964</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -5188,12 +5473,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24051</v>
+                                    <v>24050</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>1744</v>
+                                    <v>1743</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5209,32 +5494,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16038</v>
+                                    <v>16039</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3521</v>
+                                    <v>3519</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1869</v>
+                                    <v>1868</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>2553</v>
+                                    <v>2554</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>18</b>
-                                    <v>2129</v>
+                                    <v>2128</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>6833</b>
-                                    <v>1484</v>
+                                    <v>1483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5250,7 +5535,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27594</v>
+                                    <v>27591</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5260,19 +5545,19 @@
         </relation>
         <relation>
             <name>constvalues</name>
-            <cardinality>43931</cardinality>
+            <cardinality>43919</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>43931</v>
+                    <v>43919</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>16896</v>
+                    <v>16894</v>
                 </e>
                 <e>
                     <k>exact</k>
-                    <v>16897</v>
+                    <v>16895</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5286,7 +5571,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43931</v>
+                                    <v>43919</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5302,7 +5587,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43931</v>
+                                    <v>43919</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5318,7 +5603,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14932</v>
+                                    <v>14930</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5344,7 +5629,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16895</v>
+                                    <v>16893</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5365,7 +5650,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14933</v>
+                                    <v>14931</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5391,7 +5676,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16897</v>
+                                    <v>16895</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5637,11 +5922,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>73990</cardinality>
+            <cardinality>73979</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>73990</v>
+                    <v>73979</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -5649,7 +5934,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>41543</v>
+                    <v>41539</v>
                 </e>
                 <e>
                     <k>idx</k>
@@ -5667,7 +5952,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73990</v>
+                                    <v>73979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5683,7 +5968,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73990</v>
+                                    <v>73979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5699,7 +5984,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73990</v>
+                                    <v>73979</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5759,17 +6044,17 @@
                                 </b>
                                 <b>
                                     <a>3476</a>
-                                    <b>7606</b>
+                                    <b>7605</b>
                                     <v>3</v>
                                 </b>
                                 <b>
                                     <a>9225</a>
-                                    <b>9729</b>
+                                    <b>9727</b>
                                     <v>3</v>
                                 </b>
                                 <b>
-                                    <a>19358</a>
-                                    <b>19359</b>
+                                    <a>19356</a>
+                                    <b>19357</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -5825,22 +6110,22 @@
                                 </b>
                                 <b>
                                     <a>606</a>
-                                    <b>1154</b>
+                                    <b>1153</b>
                                     <v>3</v>
                                 </b>
                                 <b>
                                     <a>1719</a>
-                                    <b>5672</b>
+                                    <b>5671</b>
                                     <v>3</v>
                                 </b>
                                 <b>
-                                    <a>5912</a>
+                                    <a>5911</a>
                                     <b>9226</b>
                                     <v>3</v>
                                 </b>
                                 <b>
-                                    <a>18820</a>
-                                    <b>18821</b>
+                                    <a>18818</a>
+                                    <b>18819</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -5928,7 +6213,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29362</v>
+                                    <v>29359</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5943,7 +6228,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>82</b>
-                                    <v>2394</v>
+                                    <v>2393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5959,7 +6244,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31418</v>
+                                    <v>31415</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5969,7 +6254,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>3597</v>
+                                    <v>3596</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -5990,7 +6275,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29362</v>
+                                    <v>29359</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6005,7 +6290,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>82</b>
-                                    <v>2394</v>
+                                    <v>2393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6060,12 +6345,12 @@
                                 </b>
                                 <b>
                                     <a>314</a>
-                                    <b>1279</b>
+                                    <b>1278</b>
                                     <v>7</v>
                                 </b>
                                 <b>
-                                    <a>1720</a>
-                                    <b>24879</b>
+                                    <a>1719</a>
+                                    <b>24877</b>
                                     <v>6</v>
                                 </b>
                             </bs>
@@ -6182,12 +6467,12 @@
                                 </b>
                                 <b>
                                     <a>314</a>
-                                    <b>1279</b>
+                                    <b>1278</b>
                                     <v>7</v>
                                 </b>
                                 <b>
-                                    <a>1720</a>
-                                    <b>24879</b>
+                                    <a>1719</a>
+                                    <b>24877</b>
                                     <v>6</v>
                                 </b>
                             </bs>
@@ -6198,11 +6483,11 @@
         </relation>
         <relation>
             <name>decls</name>
-            <cardinality>8690</cardinality>
+            <cardinality>8688</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8690</v>
+                    <v>8688</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -6210,7 +6495,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>1951</v>
+                    <v>1949</v>
                 </e>
                 <e>
                     <k>idx</k>
@@ -6228,7 +6513,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8690</v>
+                                    <v>8688</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6244,7 +6529,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8690</v>
+                                    <v>8688</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6260,7 +6545,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8690</v>
+                                    <v>8688</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6274,8 +6559,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>280</a>
-                                    <b>281</b>
+                                    <a>278</a>
+                                    <b>279</b>
                                     <v>1</v>
                                 </b>
                                 <b>
@@ -6310,8 +6595,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>196</a>
-                                    <b>197</b>
+                                    <a>194</a>
+                                    <b>195</b>
                                     <v>1</v>
                                 </b>
                                 <b>
@@ -6384,7 +6669,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1460</v>
+                                    <v>1458</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6420,7 +6705,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1463</v>
+                                    <v>1461</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6456,7 +6741,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1460</v>
+                                    <v>1458</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6541,7 +6826,7 @@
                                 </b>
                                 <b>
                                     <a>323</a>
-                                    <b>1952</b>
+                                    <b>1950</b>
                                     <v>7</v>
                                 </b>
                             </bs>
@@ -6643,7 +6928,7 @@
                                 </b>
                                 <b>
                                     <a>323</a>
-                                    <b>1952</b>
+                                    <b>1950</b>
                                     <v>7</v>
                                 </b>
                             </bs>
@@ -6654,11 +6939,11 @@
         </relation>
         <relation>
             <name>specs</name>
-            <cardinality>7889</cardinality>
+            <cardinality>7885</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7889</v>
+                    <v>7885</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -6666,7 +6951,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>3877</v>
+                    <v>3875</v>
                 </e>
                 <e>
                     <k>idx</k>
@@ -6684,7 +6969,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7889</v>
+                                    <v>7885</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6700,7 +6985,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7889</v>
+                                    <v>7885</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6716,7 +7001,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7889</v>
+                                    <v>7885</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6735,13 +7020,13 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>3056</a>
-                                    <b>3057</b>
+                                    <a>3054</a>
+                                    <b>3055</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>3468</a>
-                                    <b>3469</b>
+                                    <a>3466</a>
+                                    <b>3467</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -6766,8 +7051,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>2049</a>
-                                    <b>2050</b>
+                                    <a>2047</a>
+                                    <b>2048</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -6810,12 +7095,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3206</v>
+                                    <v>3205</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>343</v>
+                                    <v>342</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -6841,7 +7126,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3877</v>
+                                    <v>3875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6857,12 +7142,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3206</v>
+                                    <v>3205</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>343</v>
+                                    <v>342</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -6912,7 +7197,7 @@
                                 </b>
                                 <b>
                                     <a>188</a>
-                                    <b>3878</b>
+                                    <b>3876</b>
                                     <v>9</v>
                                 </b>
                             </bs>
@@ -6979,7 +7264,7 @@
                                 </b>
                                 <b>
                                     <a>188</a>
-                                    <b>3878</b>
+                                    <b>3876</b>
                                     <v>9</v>
                                 </b>
                             </bs>
@@ -6990,11 +7275,11 @@
         </relation>
         <relation>
             <name>scopes</name>
-            <cardinality>36769</cardinality>
+            <cardinality>36767</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>36769</v>
+                    <v>36767</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -7012,7 +7297,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36769</v>
+                                    <v>36767</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7031,13 +7316,13 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>340</a>
-                                    <b>341</b>
+                                    <a>342</a>
+                                    <b>343</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>36428</a>
-                                    <b>36429</b>
+                                    <a>36424</a>
+                                    <b>36425</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -7048,15 +7333,15 @@
         </relation>
         <relation>
             <name>scopenesting</name>
-            <cardinality>36768</cardinality>
+            <cardinality>36766</cardinality>
             <columnsizes>
                 <e>
                     <k>inner</k>
-                    <v>36768</v>
+                    <v>36766</v>
                 </e>
                 <e>
                     <k>outer</k>
-                    <v>21713</v>
+                    <v>21710</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7070,7 +7355,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36768</v>
+                                    <v>36766</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7086,12 +7371,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16964</v>
+                                    <v>16962</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2474</v>
+                                    <v>2473</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7100,7 +7385,7 @@
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>341</b>
+                                    <b>343</b>
                                     <v>516</v>
                                 </b>
                             </bs>
@@ -7111,15 +7396,15 @@
         </relation>
         <relation>
             <name>scopenodes</name>
-            <cardinality>36428</cardinality>
+            <cardinality>36424</cardinality>
             <columnsizes>
                 <e>
                     <k>node</k>
-                    <v>36428</v>
+                    <v>36424</v>
                 </e>
                 <e>
                     <k>scope</k>
-                    <v>36428</v>
+                    <v>36424</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7133,7 +7418,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36428</v>
+                                    <v>36424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7149,7 +7434,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>36428</v>
+                                    <v>36424</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7159,11 +7444,11 @@
         </relation>
         <relation>
             <name>objects</name>
-            <cardinality>83164</cardinality>
+            <cardinality>83210</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>83164</v>
+                    <v>83210</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -7171,7 +7456,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>29529</v>
+                    <v>29409</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7185,7 +7470,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83164</v>
+                                    <v>83210</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7201,7 +7486,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83164</v>
+                                    <v>83210</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7235,28 +7520,28 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>3468</a>
-                                    <b>3469</b>
+                                    <a>3466</a>
+                                    <b>3467</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>3499</a>
-                                    <b>3500</b>
+                                    <a>3526</a>
+                                    <b>3527</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>8488</a>
-                                    <b>8489</b>
+                                    <a>8262</a>
+                                    <b>8263</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>17254</a>
-                                    <b>17255</b>
+                                    <a>17441</a>
+                                    <b>17442</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>50364</a>
-                                    <b>50365</b>
+                                    <a>50424</a>
+                                    <b>50425</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -7296,23 +7581,23 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>2924</a>
-                                    <b>2925</b>
+                                    <a>2937</a>
+                                    <b>2938</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>8047</a>
-                                    <b>8048</b>
+                                    <a>7822</a>
+                                    <b>7823</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>9830</a>
-                                    <b>9831</b>
+                                    <a>9789</a>
+                                    <b>9790</b>
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>10578</a>
-                                    <b>10579</b>
+                                    <a>10708</a>
+                                    <b>10709</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -7329,22 +7614,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24319</v>
+                                    <v>24165</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2560</v>
+                                    <v>2593</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>17</b>
-                                    <v>2229</v>
+                                    <v>2228</v>
                                 </b>
                                 <b>
                                     <a>17</a>
-                                    <b>2197</b>
-                                    <v>421</v>
+                                    <b>2198</b>
+                                    <v>423</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7360,12 +7645,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27797</v>
+                                    <v>27682</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1732</v>
+                                    <v>1727</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7375,15 +7660,15 @@
         </relation>
         <relation>
             <name>objectscopes</name>
-            <cardinality>53871</cardinality>
+            <cardinality>53810</cardinality>
             <columnsizes>
                 <e>
                     <k>object</k>
-                    <v>53871</v>
+                    <v>53810</v>
                 </e>
                 <e>
                     <k>scope</k>
-                    <v>13941</v>
+                    <v>13943</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7397,7 +7682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53871</v>
+                                    <v>53810</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7413,7 +7698,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7111</v>
+                                    <v>7114</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7423,7 +7708,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1276</v>
+                                    <v>1275</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -7437,7 +7722,7 @@
                                 </b>
                                 <b>
                                     <a>15</a>
-                                    <b>2515</b>
+                                    <b>2484</b>
                                     <v>266</v>
                                 </b>
                             </bs>
@@ -7448,15 +7733,15 @@
         </relation>
         <relation>
             <name>objecttypes</name>
-            <cardinality>83162</cardinality>
+            <cardinality>83208</cardinality>
             <columnsizes>
                 <e>
                     <k>object</k>
-                    <v>83162</v>
+                    <v>83208</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>13061</v>
+                    <v>13063</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7470,7 +7755,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83162</v>
+                                    <v>83208</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7486,32 +7771,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7630</v>
+                                    <v>7609</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2068</v>
+                                    <v>2069</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>863</v>
+                                    <v>872</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>1150</v>
+                                    <v>1156</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>25</b>
-                                    <v>993</v>
+                                    <b>24</b>
+                                    <v>983</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>4231</b>
-                                    <v>357</v>
+                                    <a>24</a>
+                                    <b>4235</b>
+                                    <v>374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7521,15 +7806,15 @@
         </relation>
         <relation>
             <name>methodreceivers</name>
-            <cardinality>9624</cardinality>
+            <cardinality>9670</cardinality>
             <columnsizes>
                 <e>
                     <k>method</k>
-                    <v>9624</v>
+                    <v>9670</v>
                 </e>
                 <e>
                     <k>receiver</k>
-                    <v>9624</v>
+                    <v>9670</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7543,7 +7828,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9624</v>
+                                    <v>9670</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7559,7 +7844,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9624</v>
+                                    <v>9670</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7569,11 +7854,11 @@
         </relation>
         <relation>
             <name>fieldstructs</name>
-            <cardinality>10590</cardinality>
+            <cardinality>10605</cardinality>
             <columnsizes>
                 <e>
                     <k>field</k>
-                    <v>10590</v>
+                    <v>10605</v>
                 </e>
                 <e>
                     <k>struct</k>
@@ -7591,7 +7876,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10590</v>
+                                    <v>10605</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7607,41 +7892,41 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>249</v>
+                                    <v>251</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>664</v>
+                                    <v>660</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>446</v>
+                                    <v>450</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>286</v>
+                                    <v>284</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>192</v>
+                                    <v>191</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>203</v>
+                                    <v>200</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>13</b>
-                                    <v>190</v>
+                                    <v>194</v>
                                 </b>
                                 <b>
                                     <a>13</a>
-                                    <b>61</b>
+                                    <b>62</b>
                                     <v>108</v>
                                 </b>
                             </bs>
@@ -7652,15 +7937,15 @@
         </relation>
         <relation>
             <name>methodhosts</name>
-            <cardinality>792</cardinality>
+            <cardinality>801</cardinality>
             <columnsizes>
                 <e>
                     <k>method</k>
-                    <v>672</v>
+                    <v>681</v>
                 </e>
                 <e>
                     <k>host</k>
-                    <v>241</v>
+                    <v>246</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7674,7 +7959,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>610</v>
+                                    <v>619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7700,7 +7985,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>95</v>
+                                    <v>99</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7720,7 +8005,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>15</v>
+                                    <v>16</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -7740,15 +8025,15 @@
         </relation>
         <relation>
             <name>defs</name>
-            <cardinality>40703</cardinality>
+            <cardinality>40698</cardinality>
             <columnsizes>
                 <e>
                     <k>ident</k>
-                    <v>40703</v>
+                    <v>40698</v>
                 </e>
                 <e>
                     <k>object</k>
-                    <v>40490</v>
+                    <v>40485</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7762,7 +8047,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40703</v>
+                                    <v>40698</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7778,7 +8063,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40383</v>
+                                    <v>40378</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7793,15 +8078,15 @@
         </relation>
         <relation>
             <name>uses</name>
-            <cardinality>195902</cardinality>
+            <cardinality>195872</cardinality>
             <columnsizes>
                 <e>
                     <k>ident</k>
-                    <v>195902</v>
+                    <v>195872</v>
                 </e>
                 <e>
                     <k>object</k>
-                    <v>41616</v>
+                    <v>41610</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7815,7 +8100,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>195902</v>
+                                    <v>195872</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7831,32 +8116,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15493</v>
+                                    <v>15495</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9727</v>
+                                    <v>9723</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5056</v>
+                                    <v>5053</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>2974</v>
+                                    <v>2975</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>3203</v>
+                                    <v>3202</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>14</b>
-                                    <v>3336</v>
+                                    <v>3335</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -7917,8 +8202,8 @@
                                     <v>3</v>
                                 </b>
                                 <b>
-                                    <a>232</a>
-                                    <b>417</b>
+                                    <a>237</a>
+                                    <b>418</b>
                                     <v>3</v>
                                 </b>
                                 <b>
@@ -7928,7 +8213,7 @@
                                 </b>
                                 <b>
                                     <a>2339</a>
-                                    <b>7772</b>
+                                    <b>7754</b>
                                     <v>3</v>
                                 </b>
                             </bs>
@@ -7939,11 +8224,11 @@
         </relation>
         <relation>
             <name>type_of</name>
-            <cardinality>397965</cardinality>
+            <cardinality>397900</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>397965</v>
+                    <v>397900</v>
                 </e>
                 <e>
                     <k>tp</k>
@@ -7961,7 +8246,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>397965</v>
+                                    <v>397900</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7977,12 +8262,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2010</v>
+                                    <v>2011</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>962</v>
+                                    <v>961</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7997,7 +8282,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>783</v>
+                                    <v>784</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -8007,7 +8292,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>15</b>
-                                    <v>737</v>
+                                    <v>736</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -8026,7 +8311,7 @@
                                 </b>
                                 <b>
                                     <a>150</a>
-                                    <b>46949</b>
+                                    <b>46948</b>
                                     <v>303</v>
                                 </b>
                             </bs>
@@ -8037,15 +8322,15 @@
         </relation>
         <relation>
             <name>typename</name>
-            <cardinality>3471</cardinality>
+            <cardinality>3488</cardinality>
             <columnsizes>
                 <e>
                     <k>tp</k>
-                    <v>3471</v>
+                    <v>3488</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>2903</v>
+                    <v>2909</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8059,7 +8344,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3471</v>
+                                    <v>3488</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8079,13 +8364,13 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>4</b>
-                                    <v>265</v>
+                                    <b>3</b>
+                                    <v>212</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
+                                    <a>3</a>
                                     <b>16</b>
-                                    <v>54</v>
+                                    <v>113</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8095,11 +8380,11 @@
         </relation>
         <relation>
             <name>key_type</name>
-            <cardinality>416</cardinality>
+            <cardinality>417</cardinality>
             <columnsizes>
                 <e>
                     <k>map</k>
-                    <v>416</v>
+                    <v>417</v>
                 </e>
                 <e>
                     <k>tp</k>
@@ -8117,7 +8402,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>416</v>
+                                    <v>417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8163,15 +8448,15 @@
         </relation>
         <relation>
             <name>element_type</name>
-            <cardinality>1378</cardinality>
+            <cardinality>1374</cardinality>
             <columnsizes>
                 <e>
                     <k>container</k>
-                    <v>1378</v>
+                    <v>1374</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>892</v>
+                    <v>889</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8185,7 +8470,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1378</v>
+                                    <v>1374</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8201,7 +8486,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>756</v>
+                                    <v>753</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8269,15 +8554,15 @@
         </relation>
         <relation>
             <name>underlying_type</name>
-            <cardinality>3471</cardinality>
+            <cardinality>3488</cardinality>
             <columnsizes>
                 <e>
                     <k>named</k>
-                    <v>3471</v>
+                    <v>3488</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>2677</v>
+                    <v>2681</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8291,7 +8576,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3471</v>
+                                    <v>3488</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8307,12 +8592,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2505</v>
+                                    <v>2508</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>148</b>
-                                    <v>172</v>
+                                    <b>150</b>
+                                    <v>173</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8322,23 +8607,23 @@
         </relation>
         <relation>
             <name>component_types</name>
-            <cardinality>35194</cardinality>
+            <cardinality>35096</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>10897</v>
+                    <v>10884</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>70</v>
+                    <v>71</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>5338</v>
+                    <v>5292</v>
                 </e>
                 <e>
                     <k>tp</k>
-                    <v>4170</v>
+                    <v>4184</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8352,37 +8637,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1157</v>
+                                    <v>1166</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3876</v>
+                                    <v>3880</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2794</v>
+                                    <v>2795</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1377</v>
+                                    <v>1374</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>759</v>
+                                    <v>740</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>14</b>
-                                    <v>828</v>
+                                    <v>824</v>
                                 </b>
                                 <b>
                                     <a>14</a>
-                                    <b>61</b>
-                                    <v>106</v>
+                                    <b>62</b>
+                                    <v>105</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8398,22 +8683,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8683</v>
+                                    <v>8671</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>712</v>
+                                    <v>708</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>975</v>
+                                    <v>977</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>60</b>
-                                    <v>527</v>
+                                    <b>61</b>
+                                    <v>528</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8429,32 +8714,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2231</v>
+                                    <v>2237</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4345</v>
+                                    <v>4333</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2382</v>
+                                    <v>2373</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1068</v>
+                                    <v>1065</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>13</b>
-                                    <v>822</v>
+                                    <b>12</b>
+                                    <v>819</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
+                                    <a>12</a>
                                     <b>52</b>
-                                    <v>49</v>
+                                    <v>57</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8470,7 +8755,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12</v>
+                                    <v>13</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8484,48 +8769,48 @@
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>11</b>
+                                    <b>12</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>17</b>
-                                    <v>5</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>23</b>
+                                    <a>12</a>
+                                    <b>18</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>42</b>
+                                    <a>18</a>
+                                    <b>26</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>47</a>
-                                    <b>70</b>
+                                    <a>26</a>
+                                    <b>47</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>81</a>
-                                    <b>152</b>
+                                    <a>51</a>
+                                    <b>82</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>186</a>
-                                    <b>490</b>
+                                    <a>90</a>
+                                    <b>185</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>794</a>
-                                    <b>5839</b>
+                                    <a>227</a>
+                                    <b>793</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>6257</a>
-                                    <b>9983</b>
-                                    <v>2</v>
+                                    <a>1448</a>
+                                    <b>6238</b>
+                                    <v>6</v>
+                                </b>
+                                <b>
+                                    <a>9957</a>
+                                    <b>9958</b>
+                                    <v>1</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8541,7 +8826,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18</v>
+                                    <v>19</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8554,39 +8839,39 @@
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>15</b>
+                                    <a>10</a>
+                                    <b>16</b>
                                     <v>5</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>22</b>
-                                    <v>5</v>
+                                    <a>17</a>
+                                    <b>23</b>
+                                    <v>6</v>
                                 </b>
                                 <b>
-                                    <a>22</a>
-                                    <b>33</b>
+                                    <a>23</a>
+                                    <b>35</b>
                                     <v>6</v>
                                 </b>
                                 <b>
                                     <a>36</a>
-                                    <b>59</b>
+                                    <b>67</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>66</a>
-                                    <b>112</b>
+                                    <a>76</a>
+                                    <b>142</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>143</a>
-                                    <b>355</b>
+                                    <a>167</a>
+                                    <b>449</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>455</a>
-                                    <b>1228</b>
-                                    <v>6</v>
+                                    <a>595</a>
+                                    <b>1217</b>
+                                    <v>5</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8602,7 +8887,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12</v>
+                                    <v>13</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8616,49 +8901,49 @@
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>8</b>
+                                    <b>9</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
+                                    <a>10</a>
                                     <b>14</b>
-                                    <v>6</v>
+                                    <v>4</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>6</v>
+                                    <v>4</v>
                                 </b>
                                 <b>
                                     <a>18</a>
-                                    <b>28</b>
+                                    <b>21</b>
+                                    <v>6</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>32</b>
                                     <v>6</v>
                                 </b>
                                 <b>
                                     <a>32</a>
-                                    <b>46</b>
+                                    <b>48</b>
+                                    <v>5</v>
+                                </b>
+                                <b>
+                                    <a>51</a>
+                                    <b>102</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>47</a>
-                                    <b>84</b>
+                                    <a>116</a>
+                                    <b>294</b>
                                     <v>6</v>
                                 </b>
                                 <b>
-                                    <a>103</a>
-                                    <b>216</b>
+                                    <a>453</a>
+                                    <b>2093</b>
                                     <v>6</v>
                                 </b>
-                                <b>
-                                    <a>297</a>
-                                    <b>1836</b>
-                                    <v>6</v>
-                                </b>
-                                <b>
-                                    <a>2095</a>
-                                    <b>2096</b>
-                                    <v>1</v>
-                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -8673,22 +8958,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3759</v>
+                                    <v>3693</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>847</v>
+                                    <v>864</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>406</v>
+                                    <v>414</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>8670</b>
-                                    <v>326</v>
+                                    <b>8652</b>
+                                    <v>321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8704,22 +8989,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4132</v>
+                                    <v>4093</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>704</v>
+                                    <v>699</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>423</v>
+                                    <v>422</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>28</b>
-                                    <v>79</v>
+                                    <v>78</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8735,22 +9020,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4426</v>
+                                    <v>4385</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>498</v>
+                                    <v>496</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>16</b>
-                                    <v>401</v>
+                                    <v>397</v>
                                 </b>
                                 <b>
                                     <a>16</a>
-                                    <b>2936</b>
-                                    <v>13</v>
+                                    <b>2944</b>
+                                    <v>14</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8771,27 +9056,27 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>795</v>
+                                    <v>815</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>400</v>
+                                    <v>392</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>374</v>
+                                    <v>376</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>330</v>
+                                    <v>329</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>2115</b>
-                                    <v>279</v>
+                                    <b>2102</b>
+                                    <v>280</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8807,27 +9092,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2042</v>
+                                    <v>2048</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>836</v>
+                                    <v>846</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>561</v>
+                                    <v>559</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>347</v>
+                                    <v>346</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>10</b>
-                                    <v>324</v>
+                                    <v>325</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -8848,12 +9133,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2808</v>
+                                    <v>2823</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>841</v>
+                                    <v>840</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8862,7 +9147,7 @@
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>679</b>
+                                    <b>677</b>
                                     <v>188</v>
                                 </b>
                             </bs>
@@ -8873,15 +9158,15 @@
         </relation>
         <relation>
             <name>array_length</name>
-            <cardinality>292</cardinality>
+            <cardinality>284</cardinality>
             <columnsizes>
                 <e>
                     <k>tp</k>
-                    <v>292</v>
+                    <v>284</v>
                 </e>
                 <e>
                     <k>len</k>
-                    <v>103</v>
+                    <v>99</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8895,7 +9180,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>292</v>
+                                    <v>284</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8911,32 +9196,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62</v>
+                                    <v>59</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16</v>
+                                    <v>14</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
+                                    <b>4</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>8</b>
+                                    <a>4</a>
+                                    <b>7</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>16</b>
+                                    <a>7</a>
+                                    <b>15</b>
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>26</a>
-                                    <b>27</b>
-                                    <v>1</v>
+                                    <a>15</a>
+                                    <b>26</b>
+                                    <v>2</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8946,15 +9231,15 @@
         </relation>
         <relation>
             <name>type_objects</name>
-            <cardinality>3471</cardinality>
+            <cardinality>3488</cardinality>
             <columnsizes>
                 <e>
                     <k>tp</k>
-                    <v>3471</v>
+                    <v>3488</v>
                 </e>
                 <e>
                     <k>object</k>
-                    <v>3471</v>
+                    <v>3488</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8968,7 +9253,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3471</v>
+                                    <v>3488</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8984,7 +9269,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3471</v>
+                                    <v>3488</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8994,23 +9279,23 @@
         </relation>
         <relation>
             <name>packages</name>
-            <cardinality>340</cardinality>
+            <cardinality>342</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>340</v>
+                    <v>342</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>275</v>
+                    <v>277</v>
                 </e>
                 <e>
                     <k>path</k>
-                    <v>340</v>
+                    <v>342</v>
                 </e>
                 <e>
                     <k>scope</k>
-                    <v>340</v>
+                    <v>342</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9024,7 +9309,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>340</v>
+                                    <v>342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9040,7 +9325,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>340</v>
+                                    <v>342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9056,7 +9341,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>340</v>
+                                    <v>342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9072,7 +9357,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>249</v>
+                                    <v>251</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9098,7 +9383,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>249</v>
+                                    <v>251</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9124,7 +9409,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>249</v>
+                                    <v>251</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9150,7 +9435,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>340</v>
+                                    <v>342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9166,7 +9451,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>340</v>
+                                    <v>342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9182,7 +9467,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>340</v>
+                                    <v>342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9198,7 +9483,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>340</v>
+                                    <v>342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9214,7 +9499,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>340</v>
+                                    <v>342</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9230,7 +9515,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>340</v>
+                                    <v>342</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/ql/src/semmle/go/AST.qll b/ql/src/semmle/go/AST.qll
index 93aa69c488e..65c9a8e7ad7 100644
--- a/ql/src/semmle/go/AST.qll
+++ b/ql/src/semmle/go/AST.qll
@@ -20,7 +20,9 @@ class AstNode extends @node, Locatable {
     result = this.(StmtParent).getChildStmt(i) or
     result = this.(DeclParent).getDecl(i) or
     result = this.(GenDecl).getSpec(i) or
-    result = this.(FieldParent).getField(i)
+    result = this.(FieldParent).getField(i) or
+    result = this.(File).getCommentGroup(i) or
+    result = this.(CommentGroup).getComment(i)
   }
 
   /**
diff --git a/ql/src/semmle/go/Comments.qll b/ql/src/semmle/go/Comments.qll
index 5326825b1aa..3dce789efba 100644
--- a/ql/src/semmle/go/Comments.qll
+++ b/ql/src/semmle/go/Comments.qll
@@ -51,6 +51,11 @@ class Comment extends @comment, AstNode {
  * </pre>
  */
 class CommentGroup extends @comment_group, AstNode {
+  /**
+   * Gets the file to which this comment group belongs.
+   */
+  override File getParent() { this = result.getACommentGroup() }
+
   /** Gets the `i`th comment in this group (0-based indexing). */
   Comment getComment(int i) { comments(result, _, this, i, _) }
 
diff --git a/ql/src/semmle/go/Files.qll b/ql/src/semmle/go/Files.qll
index ff6193d31e8..e157b80c9b6 100644
--- a/ql/src/semmle/go/Files.qll
+++ b/ql/src/semmle/go/Files.qll
@@ -208,5 +208,14 @@ class File extends Container, @file, Documentable, ExprParent, GoModExprParent,
   /** Gets the URL of this file. */
   override string getURL() { result = "file://" + this.getAbsolutePath() + ":0:0:0:0" }
 
+  /** Gets the `i`th child comment group. */
+  CommentGroup getCommentGroup(int i) { comment_groups(result, this, i) }
+
+  /** Gets a child comment group. */
+  CommentGroup getACommentGroup() { result = getCommentGroup(_) }
+
+  /** Gets the number of child comment groups of this file. */
+  int getNumCommentGroups() { result = count(getACommentGroup()) }
+
   override string getAPrimaryQlClass() { result = "File" }
 }
diff --git a/ql/src/semmle/go/PrintAst.qll b/ql/src/semmle/go/PrintAst.qll
index 5a46cf18c1d..8ababe787c5 100644
--- a/ql/src/semmle/go/PrintAst.qll
+++ b/ql/src/semmle/go/PrintAst.qll
@@ -115,7 +115,11 @@ private AstNode getChildOfKind(AstNode parent, string kind, int i) {
   or
   kind = "spec" and result = parent.(GenDecl).getSpec(i)
   or
-  kind = "field" and fields(result, parent, i)
+  kind = "field" and result = parent.(FieldParent).getField(i)
+  or
+  kind = "commentgroup" and result = parent.(File).getCommentGroup(i)
+  or
+  kind = "comment" and result = parent.(CommentGroup).getComment(i)
 }
 
 /**
diff --git a/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected b/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected
index 35e1d303689..e232a6d8de2 100644
--- a/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected
+++ b/ql/test/library-tests/semmle/go/PrintAst/PrintAst.expected
@@ -1,9 +1,29 @@
 input.go:
 #    0| [File] library-tests/semmle/go/PrintAst/input.go
-#    3|   0: [ImportDecl] import declaration
+#    5|   0: [CommentGroup] comment group
+#    5|     0: [SlashSlashComment] comment
+#    7|   1: [CommentGroup] comment group
+#    7|     0: [SlashSlashComment] comment
+#    9|   2: [DocComment] comment group
+#    9|     0: [SlashSlashComment] comment
+#   17|   3: [CommentGroup] comment group
+#   17|     0: [SlashSlashComment] comment
+#   45|   4: [DocComment] comment group
+#   45|     0: [SlashSlashComment] comment
+#   64|   5: [DocComment] comment group
+#   64|     0: [SlashSlashComment] comment
+#   74|   6: [DocComment] comment group
+#   74|     0: [SlashSlashComment] comment
+#  111|   7: [DocComment] comment group
+#  111|     0: [SlashSlashComment] comment
+#  127|   8: [DocComment] comment group
+#  127|     0: [SlashSlashComment] comment
+#  132|   9: [DocComment] comment group
+#  132|     0: [SlashSlashComment] comment
+#    3|   10: [ImportDecl] import declaration
 #    3|     0: [ImportSpec] import specifier
 #    3|       0: [StringLit] "fmt"
-#   10|   1: [FuncDecl] function declaration
+#   10|   11: [FuncDecl] function declaration
 #   10|     0: [FunctionName, Ident] test5
 #   10|         Type = func(bool) 
 #   10|     1: [FuncTypeExpr] function type
@@ -128,7 +148,7 @@ input.go:
 #   40|         1: [BlockStmt] block statement
 #   41|           0: [GotoStmt] goto statement
 #   41|             0: [Ident, LabelName] outer
-#   46|   2: [FuncDecl] function declaration
+#   46|   12: [FuncDecl] function declaration
 #   46|     0: [FunctionName, Ident] test6
 #   46|         Type = func(chan int, chan float32) 
 #   46|     1: [FuncTypeExpr] function type
@@ -238,7 +258,7 @@ input.go:
 #   58|                   Value = [IntLit] 42
 #   61|       3: [SelectStmt] select statement
 #   61|         0: [BlockStmt] block statement
-#   65|   3: [FuncDecl] function declaration
+#   65|   13: [FuncDecl] function declaration
 #   65|     0: [FunctionName, Ident] test7
 #   65|         Type = func(int) int
 #   65|     1: [FuncTypeExpr] function type
@@ -303,7 +323,7 @@ input.go:
 #   71|         0: [IntLit] 42
 #   71|             Type = int
 #   71|             Value = [IntLit] 42
-#   75|   4: [FuncDecl] function declaration
+#   75|   14: [FuncDecl] function declaration
 #   75|     0: [FunctionName, Ident] test8
 #   75|         Type = func(int) 
 #   75|     1: [FuncTypeExpr] function type
@@ -423,7 +443,7 @@ input.go:
 #  107|             0: [ConstantName, Ident] true
 #  107|                 Type = bool
 #  107|                 Value = [ConstantName, Ident] true
-#  112|   5: [FuncDecl] function declaration
+#  112|   15: [FuncDecl] function declaration
 #  112|     0: [FunctionName, Ident] test9
 #  112|         Type = func(interface {  }) 
 #  112|     1: [FuncTypeExpr] function type
@@ -494,7 +514,7 @@ input.go:
 #  123|                 1: [ConstantName, Ident] false
 #  123|                     Type = bool
 #  123|                     Value = [ConstantName, Ident] false
-#  128|   6: [FuncDecl] function declaration
+#  128|   16: [FuncDecl] function declaration
 #  128|     0: [FunctionName, Ident] test10
 #  128|         Type = func(func() ) 
 #  128|     1: [FuncTypeExpr] function type
@@ -509,7 +529,7 @@ input.go:
 #  129|             Type = ()
 #  129|           0: [Ident, VariableName] f
 #  129|               Type = func() 
-#  133|   7: [FuncDecl] function declaration
+#  133|   17: [FuncDecl] function declaration
 #  133|     0: [FunctionName, Ident] test11
 #  133|         Type = func([]int) 
 #  133|     1: [FuncTypeExpr] function type
@@ -571,24 +591,4 @@ input.go:
 #  145|         0: [Ident, VariableName] xs
 #  145|             Type = []int
 #  145|         1: [BlockStmt] block statement
-#    1|   8: [Ident] main
-#    9| [DocComment] comment group
-#   45| [DocComment] comment group
-#   64| [DocComment] comment group
-#   74| [DocComment] comment group
-#  111| [DocComment] comment group
-#  127| [DocComment] comment group
-#  132| [DocComment] comment group
-#    5| [CommentGroup] comment group
-#    5| [SlashSlashComment] comment
-#    7| [CommentGroup] comment group
-#    7| [SlashSlashComment] comment
-#    9| [SlashSlashComment] comment
-#   17| [CommentGroup] comment group
-#   17| [SlashSlashComment] comment
-#   45| [SlashSlashComment] comment
-#   64| [SlashSlashComment] comment
-#   74| [SlashSlashComment] comment
-#  111| [SlashSlashComment] comment
-#  127| [SlashSlashComment] comment
-#  132| [SlashSlashComment] comment
+#    1|   18: [Ident] main
diff --git a/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/go.dbscheme b/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/go.dbscheme
new file mode 100644
index 00000000000..bcb9599aba6
--- /dev/null
+++ b/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/go.dbscheme
@@ -0,0 +1,431 @@
+/** Auto-generated dbscheme; do not edit. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref, string simple: string ref, string ext: string ref, int fromSource: int ref);
+
+folders(unique int id: @folder, string name: string ref, string simple: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+#keyset[parent, idx]
+comment_groups(unique int id: @comment_group, int parent: @file ref, int idx: int ref);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @namedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int named: @namedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @scopenode
+      | @comment_group | @comment;
+
+@documentable = @file | @field | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @sliceexpr
+| 14 = @typeassertexpr
+| 15 = @callorconversionexpr
+| 16 = @starexpr
+| 17 = @keyvalueexpr
+| 18 = @arraytypeexpr
+| 19 = @structtypeexpr
+| 20 = @functypeexpr
+| 21 = @interfacetypeexpr
+| 22 = @maptypeexpr
+| 23 = @plusexpr
+| 24 = @minusexpr
+| 25 = @notexpr
+| 26 = @complementexpr
+| 27 = @derefexpr
+| 28 = @addressexpr
+| 29 = @arrowexpr
+| 30 = @lorexpr
+| 31 = @landexpr
+| 32 = @eqlexpr
+| 33 = @neqexpr
+| 34 = @lssexpr
+| 35 = @leqexpr
+| 36 = @gtrexpr
+| 37 = @geqexpr
+| 38 = @addexpr
+| 39 = @subexpr
+| 40 = @orexpr
+| 41 = @xorexpr
+| 42 = @mulexpr
+| 43 = @quoexpr
+| 44 = @remexpr
+| 45 = @shlexpr
+| 46 = @shrexpr
+| 47 = @andexpr
+| 48 = @andnotexpr
+| 49 = @sendchantypeexpr
+| 50 = @recvchantypeexpr
+| 51 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typespec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @arraytype
+| 27 = @slicetype
+| 28 = @structtype
+| 29 = @pointertype
+| 30 = @interfacetype
+| 31 = @tupletype
+| 32 = @signaturetype
+| 33 = @maptype
+| 34 = @sendchantype
+| 35 = @recvchantype
+| 36 = @sendrcvchantype
+| 37 = @namedtype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @containertype | @structtype | @pointertype | @interfacetype | @tupletype | @signaturetype | @namedtype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/old.dbscheme b/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/old.dbscheme
new file mode 100644
index 00000000000..ee5c327face
--- /dev/null
+++ b/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/old.dbscheme
@@ -0,0 +1,430 @@
+/** Auto-generated dbscheme; do not edit. */
+
+
+/** Duplicate code **/
+
+duplicateCode(
+  unique int id : @duplication,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+similarCode(
+  unique int id : @similarity,
+  varchar(900) relativePath : string ref,
+  int equivClass : int ref);
+
+@duplication_or_similarity = @duplication | @similarity;
+
+tokens(
+  int id : @duplication_or_similarity ref,
+  int offset : int ref,
+  int beginLine : int ref,
+  int beginColumn : int ref,
+  int endLine : int ref,
+  int endColumn : int ref);
+
+/** External data **/
+
+externalData(
+  int id : @externalDataElement,
+  varchar(900) path : string ref,
+  int column: int ref,
+  varchar(900) value : string ref
+);
+
+snapshotDate(unique date snapshotDate : date ref);
+
+sourceLocationPrefix(varchar(900) prefix : string ref);
+
+locations_default(unique int id: @location_default, int file: @file ref, int beginLine: int ref, int beginColumn: int ref,
+                  int endLine: int ref, int endColumn: int ref);
+
+numlines(int element_id: @sourceline ref, int num_lines: int ref, int num_code: int ref, int num_comment: int ref);
+
+files(unique int id: @file, string name: string ref, string simple: string ref, string ext: string ref, int fromSource: int ref);
+
+folders(unique int id: @folder, string name: string ref, string simple: string ref);
+
+containerparent(int parent: @container ref, unique int child: @container ref);
+
+has_location(unique int locatable: @locatable ref, int location: @location ref);
+
+comment_groups(unique int id: @comment_group);
+
+comments(unique int id: @comment, int kind: int ref, int parent: @comment_group ref, int idx: int ref, string text: string ref);
+
+doc_comments(unique int node: @documentable ref, int comment: @comment_group ref);
+
+#keyset[parent, idx]
+exprs(unique int id: @expr, int kind: int ref, int parent: @exprparent ref, int idx: int ref);
+
+literals(unique int expr: @expr ref, string value: string ref, string raw: string ref);
+
+constvalues(unique int expr: @expr ref, string value: string ref, string exact: string ref);
+
+fields(unique int id: @field, int parent: @fieldparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+stmts(unique int id: @stmt, int kind: int ref, int parent: @stmtparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+decls(unique int id: @decl, int kind: int ref, int parent: @declparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+specs(unique int id: @spec, int kind: int ref, int parent: @gendecl ref, int idx: int ref);
+
+scopes(unique int id: @scope, int kind: int ref);
+
+scopenesting(unique int inner: @scope ref, int outer: @scope ref);
+
+scopenodes(unique int node: @scopenode ref, int scope: @localscope ref);
+
+objects(unique int id: @object, int kind: int ref, string name: string ref);
+
+objectscopes(unique int object: @object ref, int scope: @scope ref);
+
+objecttypes(unique int object: @object ref, int tp: @type ref);
+
+methodreceivers(unique int method: @object ref, int receiver: @object ref);
+
+fieldstructs(unique int field: @object ref, int struct: @structtype ref);
+
+methodhosts(int method: @object ref, int host: @namedtype ref);
+
+defs(int ident: @ident ref, int object: @object ref);
+
+uses(int ident: @ident ref, int object: @object ref);
+
+types(unique int id: @type, int kind: int ref);
+
+type_of(unique int expr: @expr ref, int tp: @type ref);
+
+typename(unique int tp: @type ref, string name: string ref);
+
+key_type(unique int map: @maptype ref, int tp: @type ref);
+
+element_type(unique int container: @containertype ref, int tp: @type ref);
+
+base_type(unique int ptr: @pointertype ref, int tp: @type ref);
+
+underlying_type(unique int named: @namedtype ref, int tp: @type ref);
+
+#keyset[parent, index]
+component_types(int parent: @compositetype ref, int index: int ref, string name: string ref, int tp: @type ref);
+
+array_length(unique int tp: @arraytype ref, string len: string ref);
+
+type_objects(unique int tp: @type ref, int object: @object ref);
+
+packages(unique int id: @package, string name: string ref, string path: string ref, int scope: @packagescope ref);
+
+#keyset[parent, idx]
+modexprs(unique int id: @modexpr, int kind: int ref, int parent: @modexprparent ref, int idx: int ref);
+
+#keyset[parent, idx]
+modtokens(string token: string ref, int parent: @modexpr ref, int idx: int ref);
+
+#keyset[package, idx]
+errors(unique int id: @error, int kind: int ref, string msg: string ref, string rawpos: string ref,
+       string file: string ref, int line: int ref, int col: int ref, int package: @package ref, int idx: int ref);
+
+@container = @file | @folder;
+
+@locatable = @node | @localscope;
+
+@node = @documentable | @exprparent | @modexprparent | @fieldparent | @stmtparent | @declparent | @scopenode
+      | @comment_group | @comment;
+
+@documentable = @file | @field | @spec | @gendecl | @funcdecl | @modexpr;
+
+@exprparent = @funcdef | @file | @expr | @field | @stmt | @decl | @spec;
+
+@modexprparent = @file | @modexpr;
+
+@fieldparent = @decl | @structtypeexpr | @functypeexpr | @interfacetypeexpr;
+
+@stmtparent = @funcdef | @stmt | @decl;
+
+@declparent = @file | @declstmt;
+
+@funcdef = @funclit | @funcdecl;
+
+@scopenode = @file | @functypeexpr | @blockstmt | @ifstmt | @caseclause | @switchstmt | @commclause | @loopstmt;
+
+@location = @location_default;
+
+@sourceline = @locatable;
+
+case @comment.kind of
+  0 = @slashslashcomment
+| 1 = @slashstarcomment;
+
+case @expr.kind of
+  0 = @badexpr
+| 1 = @ident
+| 2 = @ellipsis
+| 3 = @intlit
+| 4 = @floatlit
+| 5 = @imaglit
+| 6 = @charlit
+| 7 = @stringlit
+| 8 = @funclit
+| 9 = @compositelit
+| 10 = @parenexpr
+| 11 = @selectorexpr
+| 12 = @indexexpr
+| 13 = @sliceexpr
+| 14 = @typeassertexpr
+| 15 = @callorconversionexpr
+| 16 = @starexpr
+| 17 = @keyvalueexpr
+| 18 = @arraytypeexpr
+| 19 = @structtypeexpr
+| 20 = @functypeexpr
+| 21 = @interfacetypeexpr
+| 22 = @maptypeexpr
+| 23 = @plusexpr
+| 24 = @minusexpr
+| 25 = @notexpr
+| 26 = @complementexpr
+| 27 = @derefexpr
+| 28 = @addressexpr
+| 29 = @arrowexpr
+| 30 = @lorexpr
+| 31 = @landexpr
+| 32 = @eqlexpr
+| 33 = @neqexpr
+| 34 = @lssexpr
+| 35 = @leqexpr
+| 36 = @gtrexpr
+| 37 = @geqexpr
+| 38 = @addexpr
+| 39 = @subexpr
+| 40 = @orexpr
+| 41 = @xorexpr
+| 42 = @mulexpr
+| 43 = @quoexpr
+| 44 = @remexpr
+| 45 = @shlexpr
+| 46 = @shrexpr
+| 47 = @andexpr
+| 48 = @andnotexpr
+| 49 = @sendchantypeexpr
+| 50 = @recvchantypeexpr
+| 51 = @sendrcvchantypeexpr;
+
+@basiclit = @intlit | @floatlit | @imaglit | @charlit | @stringlit;
+
+@operatorexpr = @logicalexpr | @arithmeticexpr | @bitwiseexpr | @unaryexpr | @binaryexpr;
+
+@logicalexpr = @logicalunaryexpr | @logicalbinaryexpr;
+
+@arithmeticexpr = @arithmeticunaryexpr | @arithmeticbinaryexpr;
+
+@bitwiseexpr = @bitwiseunaryexpr | @bitwisebinaryexpr;
+
+@unaryexpr = @logicalunaryexpr | @bitwiseunaryexpr | @arithmeticunaryexpr | @derefexpr | @addressexpr | @arrowexpr;
+
+@logicalunaryexpr = @notexpr;
+
+@bitwiseunaryexpr = @complementexpr;
+
+@arithmeticunaryexpr = @plusexpr | @minusexpr;
+
+@binaryexpr = @logicalbinaryexpr | @bitwisebinaryexpr | @arithmeticbinaryexpr | @comparison;
+
+@logicalbinaryexpr = @lorexpr | @landexpr;
+
+@bitwisebinaryexpr = @shiftexpr | @orexpr | @xorexpr | @andexpr | @andnotexpr;
+
+@arithmeticbinaryexpr = @addexpr | @subexpr | @mulexpr | @quoexpr | @remexpr;
+
+@shiftexpr = @shlexpr | @shrexpr;
+
+@comparison = @equalitytest | @relationalcomparison;
+
+@equalitytest = @eqlexpr | @neqexpr;
+
+@relationalcomparison = @lssexpr | @leqexpr | @gtrexpr | @geqexpr;
+
+@chantypeexpr = @sendchantypeexpr | @recvchantypeexpr | @sendrcvchantypeexpr;
+
+case @stmt.kind of
+  0 = @badstmt
+| 1 = @declstmt
+| 2 = @emptystmt
+| 3 = @labeledstmt
+| 4 = @exprstmt
+| 5 = @sendstmt
+| 6 = @incstmt
+| 7 = @decstmt
+| 8 = @gostmt
+| 9 = @deferstmt
+| 10 = @returnstmt
+| 11 = @breakstmt
+| 12 = @continuestmt
+| 13 = @gotostmt
+| 14 = @fallthroughstmt
+| 15 = @blockstmt
+| 16 = @ifstmt
+| 17 = @caseclause
+| 18 = @exprswitchstmt
+| 19 = @typeswitchstmt
+| 20 = @commclause
+| 21 = @selectstmt
+| 22 = @forstmt
+| 23 = @rangestmt
+| 24 = @assignstmt
+| 25 = @definestmt
+| 26 = @addassignstmt
+| 27 = @subassignstmt
+| 28 = @mulassignstmt
+| 29 = @quoassignstmt
+| 30 = @remassignstmt
+| 31 = @andassignstmt
+| 32 = @orassignstmt
+| 33 = @xorassignstmt
+| 34 = @shlassignstmt
+| 35 = @shrassignstmt
+| 36 = @andnotassignstmt;
+
+@incdecstmt = @incstmt | @decstmt;
+
+@assignment = @simpleassignstmt | @compoundassignstmt;
+
+@simpleassignstmt = @assignstmt | @definestmt;
+
+@compoundassignstmt = @addassignstmt | @subassignstmt | @mulassignstmt | @quoassignstmt | @remassignstmt
+                    | @andassignstmt | @orassignstmt | @xorassignstmt | @shlassignstmt | @shrassignstmt | @andnotassignstmt;
+
+@branchstmt = @breakstmt | @continuestmt | @gotostmt | @fallthroughstmt;
+
+@switchstmt = @exprswitchstmt | @typeswitchstmt;
+
+@loopstmt = @forstmt | @rangestmt;
+
+case @decl.kind of
+  0 = @baddecl
+| 1 = @importdecl
+| 2 = @constdecl
+| 3 = @typedecl
+| 4 = @vardecl
+| 5 = @funcdecl;
+
+@gendecl = @importdecl | @constdecl | @typedecl | @vardecl;
+
+case @spec.kind of
+  0 = @importspec
+| 1 = @valuespec
+| 2 = @typespec;
+
+case @object.kind of
+  0 = @pkgobject
+| 1 = @decltypeobject
+| 2 = @builtintypeobject
+| 3 = @declconstobject
+| 4 = @builtinconstobject
+| 5 = @declvarobject
+| 6 = @declfunctionobject
+| 7 = @builtinfunctionobject
+| 8 = @labelobject;
+
+@declobject = @decltypeobject | @declconstobject | @declvarobject | @declfunctionobject;
+
+@builtinobject = @builtintypeobject | @builtinconstobject | @builtinfunctionobject;
+
+@typeobject = @decltypeobject | @builtintypeobject;
+
+@valueobject = @constobject | @varobject | @functionobject;
+
+@constobject = @declconstobject | @builtinconstobject;
+
+@varobject = @declvarobject;
+
+@functionobject = @declfunctionobject | @builtinfunctionobject;
+
+case @scope.kind of
+  0 = @universescope
+| 1 = @packagescope
+| 2 = @localscope;
+
+case @type.kind of
+  0 = @invalidtype
+| 1 = @boolexprtype
+| 2 = @inttype
+| 3 = @int8type
+| 4 = @int16type
+| 5 = @int32type
+| 6 = @int64type
+| 7 = @uinttype
+| 8 = @uint8type
+| 9 = @uint16type
+| 10 = @uint32type
+| 11 = @uint64type
+| 12 = @uintptrtype
+| 13 = @float32type
+| 14 = @float64type
+| 15 = @complex64type
+| 16 = @complex128type
+| 17 = @stringexprtype
+| 18 = @unsafepointertype
+| 19 = @boolliteraltype
+| 20 = @intliteraltype
+| 21 = @runeliteraltype
+| 22 = @floatliteraltype
+| 23 = @complexliteraltype
+| 24 = @stringliteraltype
+| 25 = @nilliteraltype
+| 26 = @arraytype
+| 27 = @slicetype
+| 28 = @structtype
+| 29 = @pointertype
+| 30 = @interfacetype
+| 31 = @tupletype
+| 32 = @signaturetype
+| 33 = @maptype
+| 34 = @sendchantype
+| 35 = @recvchantype
+| 36 = @sendrcvchantype
+| 37 = @namedtype;
+
+@basictype = @booltype | @numerictype | @stringtype | @literaltype | @invalidtype | @unsafepointertype;
+
+@booltype = @boolexprtype | @boolliteraltype;
+
+@numerictype = @integertype | @floattype | @complextype;
+
+@integertype = @signedintegertype | @unsignedintegertype;
+
+@signedintegertype = @inttype | @int8type | @int16type | @int32type | @int64type | @intliteraltype | @runeliteraltype;
+
+@unsignedintegertype = @uinttype | @uint8type | @uint16type | @uint32type | @uint64type | @uintptrtype;
+
+@floattype = @float32type | @float64type | @floatliteraltype;
+
+@complextype = @complex64type | @complex128type | @complexliteraltype;
+
+@stringtype = @stringexprtype | @stringliteraltype;
+
+@literaltype = @boolliteraltype | @intliteraltype | @runeliteraltype | @floatliteraltype | @complexliteraltype
+             | @stringliteraltype | @nilliteraltype;
+
+@compositetype = @containertype | @structtype | @pointertype | @interfacetype | @tupletype | @signaturetype | @namedtype;
+
+@containertype = @arraytype | @slicetype | @maptype | @chantype;
+
+@chantype = @sendchantype | @recvchantype | @sendrcvchantype;
+
+case @modexpr.kind of
+  0 = @modcommentblock
+| 1 = @modline
+| 2 = @modlineblock
+| 3 = @modlparen
+| 4 = @modrparen;
+
+case @error.kind of
+  0 = @unknownerror
+| 1 = @listerror
+| 2 = @parseerror
+| 3 = @typeerror;
+
diff --git a/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/upgrade.properties b/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/upgrade.properties
new file mode 100644
index 00000000000..08557f6a4e5
--- /dev/null
+++ b/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/upgrade.properties
@@ -0,0 +1,3 @@
+description: Give comment-group AST nodes a parent file
+compatibility: partial
+comment_groups.rel: run upgrade_comment_groups.qlo
diff --git a/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/upgrade_comment_groups.ql b/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/upgrade_comment_groups.ql
new file mode 100644
index 00000000000..6cad747641b
--- /dev/null
+++ b/upgrades/ee5c327face2866a7b3b12dcce5c291be52ebf52/upgrade_comment_groups.ql
@@ -0,0 +1,44 @@
+class File extends @file {
+  string toString() { result = "file" }
+}
+
+class Location extends @location {
+  /** Gets the file for this location. */
+  File getFile() { locations_default(this, result, _, _, _, _) }
+
+  int getStartLine() { locations_default(this, _, result, _, _, _) }
+
+  string toString() { result = "location" }
+}
+
+class Locatable extends @locatable {
+  Location getLocation() { has_location(this, result) }
+
+  string toString() { result = "locatable" }
+}
+
+class CommentGroup extends @comment_group, Locatable {
+  Comment getComment(int i) { comments(result, _, this, i, _) }
+
+  override string toString() { result = "comment group" }
+}
+
+class Comment extends @comment, Locatable {
+  override string toString() { result = "comment" }
+}
+
+Location getLocation(CommentGroup cg) {
+  result = cg.getLocation()
+  or
+  not exists(cg.getLocation()) and result = cg.getComment(0).getLocation()
+}
+
+from CommentGroup cg, File f, int idx
+where
+  f = getLocation(cg).getFile() and
+  rank[idx + 1](CommentGroup rankedcg |
+    getLocation(rankedcg).getFile() = f
+  |
+    rankedcg order by getLocation(rankedcg).getStartLine()
+  ) = cg
+select cg, f, idx