From 617edf0b70045a83202faa87e5e4a70a41655ac2 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Mon, 30 Jun 2025 14:14:14 +0200
Subject: [PATCH 1/3] C++: synchronize dbscheme

---
 config/dbscheme-fragments.json          |   3 +
 cpp/ql/lib/semmle/code/cpp/Location.qll |   2 +-
 cpp/ql/lib/semmlecode.cpp.dbscheme      | 282 +++++++++++-------------
 3 files changed, 133 insertions(+), 154 deletions(-)

diff --git a/config/dbscheme-fragments.json b/config/dbscheme-fragments.json
index b8c79fc8f3ab..c2a9a5e734b9 100644
--- a/config/dbscheme-fragments.json
+++ b/config/dbscheme-fragments.json
@@ -1,11 +1,13 @@
 {
   "files": [
+    "cpp/ql/lib/semmlecode.cpp.dbscheme",
     "javascript/ql/lib/semmlecode.javascript.dbscheme",
     "python/ql/lib/semmlecode.python.dbscheme",
     "ruby/ql/lib/ruby.dbscheme",
     "ql/ql/src/ql.dbscheme"
   ],
   "fragments": [
+    "/*- Compilations -*/",
     "/*- External data -*/",
     "/*- Files and folders -*/",
     "/*- Diagnostic messages -*/",
@@ -21,6 +23,7 @@
     "/*- DEPRECATED: Snapshot date -*/",
     "/*- DEPRECATED: Duplicate code -*/",
     "/*- DEPRECATED: Version control data -*/",
+    "/*- C++ dbscheme -*/",
     "/*- JavaScript-specific part -*/",
     "/*- Ruby dbscheme -*/",
     "/*- Erb dbscheme -*/",
diff --git a/cpp/ql/lib/semmle/code/cpp/Location.qll b/cpp/ql/lib/semmle/code/cpp/Location.qll
index 1af519b6698e..8b0a78f91aa8 100644
--- a/cpp/ql/lib/semmle/code/cpp/Location.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Location.qll
@@ -8,7 +8,7 @@ import semmle.code.cpp.File
 /**
  * A location of a C/C++ artifact.
  */
-class Location extends @location {
+class Location extends @location_default {
   /** Gets the container corresponding to this location. */
   pragma[nomagic]
   Container getContainer() { this.fullLocationInfo(result, _, _, _, _) }
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index e70d0b653187..827dbc206ea5 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -1,3 +1,4 @@
+/*- Compilations -*/
 
 /**
  * An invocation of the compiler. Note that more than one file may be
@@ -138,6 +139,7 @@ compilation_finished(
     float elapsed_seconds : float ref
 );
 
+/*- External data -*/
 
 /**
  * External data, loaded from CSV files during snapshot creation. See
@@ -145,17 +147,76 @@ compilation_finished(
  * for more information.
  */
 externalData(
-    int id : @externalDataElement,
-    string path : string ref,
-    int column: int ref,
-    string value : string ref
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
 );
 
+/*- Source location prefix -*/
+
 /**
  * The source location of the snapshot.
  */
 sourceLocationPrefix(string prefix : string ref);
 
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+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
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
 /**
  * Information about packages that provide code used during compilation.
  * The `id` is just a unique identifier.
@@ -179,36 +240,6 @@ header_to_external_package(
     int package : @external_package ref
 );
 
-/*
- * Version history
- */
-
-svnentries(
-    unique int id : @svnentry,
-    string revision : string ref,
-    string author : string ref,
-    date revisionDate : date ref,
-    int changeSize : int ref
-)
-
-svnaffectedfiles(
-    int id : @svnentry ref,
-    int file : @file ref,
-    string action : string ref
-)
-
-svnentrymsg(
-    unique int id : @svnentry ref,
-    string message : string ref
-)
-
-svnchurn(
-    int commit : @svnentry ref,
-    int file : @file ref,
-    int addedLines : int ref,
-    int deletedLines : int ref
-)
-
 /*
  * C++ dbscheme
  */
@@ -218,61 +249,9 @@ extractor_version(
     string frontend_version: string ref
 )
 
-@location = @location_default ;
-
-/**
- * The location of an element.
- * The location spans column `startcolumn` of line `startline` to
- * column `endcolumn` of line `endline` in file `file`.
- * For more information, see
- * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
- */
-locations_default(
-    /** The location of an element that is not an expression or a statement. */
-    unique int id: @location_default,
-    int container: @container ref,
-    int startLine: int ref,
-    int startColumn: int ref,
-    int endLine: int ref,
-    int endColumn: int ref
-);
-
 /** An element for which line-count information is available. */
 @sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
 
-numlines(
-    int element_id: @sourceline ref,
-    int num_lines: int ref,
-    int num_code: int ref,
-    int num_comment: int ref
-);
-
-diagnostics(
-    unique int id: @diagnostic,
-    int severity: int ref,
-    string error_tag: string ref,
-    string error_message: string ref,
-    string full_error_message: string ref,
-    int location: @location ref
-);
-
-files(
-    unique int id: @file,
-    string name: string ref
-);
-
-folders(
-    unique int id: @folder,
-    string name: string ref
-);
-
-@container = @folder | @file
-
-containerparent(
-    int parent: @container ref,
-    unique int child: @container ref
-);
-
 fileannotations(
     int id: @file ref,
     int kind: int ref,
@@ -298,7 +277,7 @@ case @macroinvocation.kind of
 macroinvocations(
     unique int id: @macroinvocation,
     int macro_id: @ppd_define ref,
-    int location: @location ref,
+    int location: @location_default ref,
     int kind: int ref
 );
 
@@ -313,7 +292,7 @@ macroparent(
 // to which a macro invocation is bound
 macrolocationbind(
     int id: @macroinvocation ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 
 #keyset[invocation, argument_index]
@@ -419,7 +398,7 @@ fun_decls(
     int function: @function ref,
     int type_id: @type ref,
     string name: string ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 fun_def(unique int id: @fun_decl ref);
 fun_specialized(unique int id: @fun_decl ref);
@@ -471,7 +450,7 @@ var_decls(
     int variable: @variable ref,
     int type_id: @type ref,
     string name: string ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 var_def(unique int id: @var_decl ref);
 var_specialized(int id: @var_decl ref);
@@ -488,7 +467,7 @@ var_requires(
 type_decls(
     unique int id: @type_decl,
     int type_id: @type ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 type_def(unique int id: @type_decl ref);
 type_decl_top(
@@ -502,8 +481,8 @@ type_requires(
 namespace_decls(
     unique int id: @namespace_decl,
     int namespace_id: @namespace ref,
-    int location: @location ref,
-    int bodylocation: @location ref
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
 );
 
 case @using.kind of
@@ -515,7 +494,7 @@ case @using.kind of
 usings(
     unique int id: @using,
     int element_id: @element ref,
-    int location: @location ref,
+    int location: @location_default ref,
     int kind: int ref
 );
 
@@ -529,7 +508,7 @@ static_asserts(
     unique int id: @static_assert,
     int condition : @expr ref,
     string message : string ref,
-    int location: @location ref,
+    int location: @location_default ref,
     int enclosing : @element ref
 );
 
@@ -585,7 +564,7 @@ enumconstants(
     int index: int ref,
     int type_id: @type ref,
     string name: string ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 
 @variable = @localscopevariable | @globalvariable | @membervariable;
@@ -889,7 +868,7 @@ is_proxy_class_for(
 type_mentions(
     unique int id: @type_mention,
     int type_id: @type ref,
-    int location: @location ref,
+    int location: @location_default ref,
     // a_symbol_reference_kind from the frontend.
     int kind: int ref
 );
@@ -946,7 +925,7 @@ template_template_argument_value(
 concept_templates(
     unique int concept_id: @concept_template,
     string name: string ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 concept_instantiation(
     unique int to: @concept_id ref,
@@ -1050,7 +1029,7 @@ attributes(
     int kind: int ref,
     string name: string ref,
     string name_space: string ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 
 case @attribute.kind of
@@ -1067,7 +1046,7 @@ attribute_args(
     int kind: int ref,
     int attribute: @attribute ref,
     int index: int ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 
 case @attribute_arg.kind of
@@ -1156,7 +1135,7 @@ derivations(
     int sub: @type ref,
     int index: int ref,
     int super: @type ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 
 derspecifiers(
@@ -1190,7 +1169,7 @@ frienddecls(
     unique int id: @frienddecl,
     int type_id: @type ref,
     int decl_id: @declaration ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 
 @declaredtype = @usertype ;
@@ -1247,7 +1226,7 @@ frienddecls(
 comments(
     unique int id: @comment,
     string contents: string ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 
 commentbinding(
@@ -1369,7 +1348,7 @@ namequalifiers(
     unique int id: @namequalifier,
     unique int qualifiableelement: @namequalifiableelement ref,
     int qualifyingelement: @namequalifyingelement ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 
 varbind(
@@ -1638,7 +1617,7 @@ initialisers(
     unique int init: @initialiser,
     int var: @accessible ref,
     unique int expr: @expr ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 
 braced_initialisers(
@@ -1657,7 +1636,7 @@ expr_ancestor(
 exprs(
     unique int id: @expr,
     int kind: int ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 
 expr_reuse(
@@ -2131,7 +2110,7 @@ lambda_capture(
     int field: @membervariable ref,
     boolean captured_by_reference: boolean ref,
     boolean is_implicit: boolean ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 
 @funbindexpr = @routineexpr
@@ -2159,7 +2138,7 @@ fold(
 stmts(
     unique int id: @stmt,
     int kind: int ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 
 case @stmt.kind of
@@ -2344,7 +2323,7 @@ jumpinfo(
 preprocdirects(
     unique int id: @preprocdirect,
     int kind: int ref,
-    int location: @location ref
+    int location: @location_default ref
 );
 case @preprocdirect.kind of
    0 = @ppd_if
@@ -2400,76 +2379,73 @@ link_parent(
     int link_target : @link_target ref
 );
 
-/* XML Files */
+/*- XML Files -*/
 
-xmlEncoding(unique int id: @file ref, string encoding: string ref);
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
 
 xmlDTDs(
-    unique int id: @xmldtd,
-    string root: string ref,
-    string publicId: string ref,
-    string systemId: string ref,
-    int fileid: @file ref
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
 );
 
 xmlElements(
-    unique int id: @xmlelement,
-    string name: string ref,
-    int parentid: @xmlparent ref,
-    int idx: int ref,
-    int fileid: @file ref
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
 );
 
 xmlAttrs(
-    unique int id: @xmlattribute,
-    int elementid: @xmlelement ref,
-    string name: string ref,
-    string value: string ref,
-    int idx: int ref,
-    int fileid: @file ref
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
 );
 
 xmlNs(
-    int id: @xmlnamespace,
-    string prefixName: string ref,
-    string URI: string ref,
-    int fileid: @file ref
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
 );
 
 xmlHasNs(
-    int elementId: @xmlnamespaceable ref,
-    int nsId: @xmlnamespace ref,
-    int fileid: @file ref
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
 );
 
 xmlComments(
-    unique int id: @xmlcomment,
-    string text: string ref,
-    int parentid: @xmlparent ref,
-    int fileid: @file ref
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
 );
 
 xmlChars(
-    unique int id: @xmlcharacters,
-    string text: string ref,
-    int parentid: @xmlparent ref,
-    int idx: int ref,
-    int isCDATA: int ref,
-    int fileid: @file ref
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
 );
 
 @xmlparent = @file | @xmlelement;
 @xmlnamespaceable = @xmlelement | @xmlattribute;
 
 xmllocations(
-    int xmlElement: @xmllocatable ref,
-    int location: @location_default ref
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
 );
 
-@xmllocatable = @xmlcharacters
-              | @xmlelement
-              | @xmlcomment
-              | @xmlattribute
-              | @xmldtd
-              | @file
-              | @xmlnamespace;
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;

From 3a3c222e461f02c3b997186279aef6a697b80312 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Mon, 30 Jun 2025 14:50:42 +0200
Subject: [PATCH 2/3] C++: Add upgrade and downgrade scripts

---
 .../old.dbscheme                              | 2451 ++++++++++++++++
 .../semmlecode.cpp.dbscheme                   | 2475 +++++++++++++++++
 .../upgrade.properties                        |    2 +
 .../old.dbscheme                              | 2475 +++++++++++++++++
 .../semmlecode.cpp.dbscheme                   | 2451 ++++++++++++++++
 .../upgrade.properties                        |    6 +
 6 files changed, 9860 insertions(+)
 create mode 100644 cpp/downgrades/827dbc206ea55377e032a8a934c8903fedc50fa0/old.dbscheme
 create mode 100644 cpp/downgrades/827dbc206ea55377e032a8a934c8903fedc50fa0/semmlecode.cpp.dbscheme
 create mode 100644 cpp/downgrades/827dbc206ea55377e032a8a934c8903fedc50fa0/upgrade.properties
 create mode 100644 cpp/ql/lib/upgrades/e70d0b653187b93d9688f21c9db46bb1cd46ab78/old.dbscheme
 create mode 100644 cpp/ql/lib/upgrades/e70d0b653187b93d9688f21c9db46bb1cd46ab78/semmlecode.cpp.dbscheme
 create mode 100644 cpp/ql/lib/upgrades/e70d0b653187b93d9688f21c9db46bb1cd46ab78/upgrade.properties

diff --git a/cpp/downgrades/827dbc206ea55377e032a8a934c8903fedc50fa0/old.dbscheme b/cpp/downgrades/827dbc206ea55377e032a8a934c8903fedc50fa0/old.dbscheme
new file mode 100644
index 000000000000..827dbc206ea5
--- /dev/null
+++ b/cpp/downgrades/827dbc206ea55377e032a8a934c8903fedc50fa0/old.dbscheme
@@ -0,0 +1,2451 @@
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+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
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/827dbc206ea55377e032a8a934c8903fedc50fa0/semmlecode.cpp.dbscheme b/cpp/downgrades/827dbc206ea55377e032a8a934c8903fedc50fa0/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..e70d0b653187
--- /dev/null
+++ b/cpp/downgrades/827dbc206ea55377e032a8a934c8903fedc50fa0/semmlecode.cpp.dbscheme
@@ -0,0 +1,2475 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_default ;
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location ref,
+    int bodylocation: @location ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/downgrades/827dbc206ea55377e032a8a934c8903fedc50fa0/upgrade.properties b/cpp/downgrades/827dbc206ea55377e032a8a934c8903fedc50fa0/upgrade.properties
new file mode 100644
index 000000000000..c77161910eea
--- /dev/null
+++ b/cpp/downgrades/827dbc206ea55377e032a8a934c8903fedc50fa0/upgrade.properties
@@ -0,0 +1,2 @@
+description: sync dbscheme and delete svn tables
+compatibility: full
diff --git a/cpp/ql/lib/upgrades/e70d0b653187b93d9688f21c9db46bb1cd46ab78/old.dbscheme b/cpp/ql/lib/upgrades/e70d0b653187b93d9688f21c9db46bb1cd46ab78/old.dbscheme
new file mode 100644
index 000000000000..e70d0b653187
--- /dev/null
+++ b/cpp/ql/lib/upgrades/e70d0b653187b93d9688f21c9db46bb1cd46ab78/old.dbscheme
@@ -0,0 +1,2475 @@
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+    int id : @externalDataElement,
+    string path : string ref,
+    int column: int ref,
+    string value : string ref
+);
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * Version history
+ */
+
+svnentries(
+    unique int id : @svnentry,
+    string revision : string ref,
+    string author : string ref,
+    date revisionDate : date ref,
+    int changeSize : int ref
+)
+
+svnaffectedfiles(
+    int id : @svnentry ref,
+    int file : @file ref,
+    string action : string ref
+)
+
+svnentrymsg(
+    unique int id : @svnentry ref,
+    string message : string ref
+)
+
+svnchurn(
+    int commit : @svnentry ref,
+    int file : @file ref,
+    int addedLines : int ref,
+    int deletedLines : int ref
+)
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+@location = @location_default ;
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+    /** The location of an element that is not an expression or a statement. */
+    unique int id: @location_default,
+    int container: @container ref,
+    int startLine: int ref,
+    int startColumn: int ref,
+    int endLine: int ref,
+    int endColumn: int ref
+);
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+numlines(
+    int element_id: @sourceline ref,
+    int num_lines: int ref,
+    int num_code: int ref,
+    int num_comment: int ref
+);
+
+diagnostics(
+    unique int id: @diagnostic,
+    int severity: int ref,
+    string error_tag: string ref,
+    string error_message: string ref,
+    string full_error_message: string ref,
+    int location: @location ref
+);
+
+files(
+    unique int id: @file,
+    string name: string ref
+);
+
+folders(
+    unique int id: @folder,
+    string name: string ref
+);
+
+@container = @folder | @file
+
+containerparent(
+    int parent: @container ref,
+    unique int child: @container ref
+);
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location ref,
+    int bodylocation: @location ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/* XML Files */
+
+xmlEncoding(unique int id: @file ref, string encoding: string ref);
+
+xmlDTDs(
+    unique int id: @xmldtd,
+    string root: string ref,
+    string publicId: string ref,
+    string systemId: string ref,
+    int fileid: @file ref
+);
+
+xmlElements(
+    unique int id: @xmlelement,
+    string name: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlAttrs(
+    unique int id: @xmlattribute,
+    int elementid: @xmlelement ref,
+    string name: string ref,
+    string value: string ref,
+    int idx: int ref,
+    int fileid: @file ref
+);
+
+xmlNs(
+    int id: @xmlnamespace,
+    string prefixName: string ref,
+    string URI: string ref,
+    int fileid: @file ref
+);
+
+xmlHasNs(
+    int elementId: @xmlnamespaceable ref,
+    int nsId: @xmlnamespace ref,
+    int fileid: @file ref
+);
+
+xmlComments(
+    unique int id: @xmlcomment,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int fileid: @file ref
+);
+
+xmlChars(
+    unique int id: @xmlcharacters,
+    string text: string ref,
+    int parentid: @xmlparent ref,
+    int idx: int ref,
+    int isCDATA: int ref,
+    int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+    int xmlElement: @xmllocatable ref,
+    int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters
+              | @xmlelement
+              | @xmlcomment
+              | @xmlattribute
+              | @xmldtd
+              | @file
+              | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/e70d0b653187b93d9688f21c9db46bb1cd46ab78/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/e70d0b653187b93d9688f21c9db46bb1cd46ab78/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..827dbc206ea5
--- /dev/null
+++ b/cpp/ql/lib/upgrades/e70d0b653187b93d9688f21c9db46bb1cd46ab78/semmlecode.cpp.dbscheme
@@ -0,0 +1,2451 @@
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+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
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+/**
+ * Information about packages that provide code used during compilation.
+ * The `id` is just a unique identifier.
+ * The `namespace` is typically the name of the package manager that
+ * provided the package (e.g. "dpkg" or "yum").
+ * The `package_name` is the name of the package, and `version` is its
+ * version (as a string).
+ */
+external_packages(
+    unique int id: @external_package,
+    string namespace : string ref,
+    string package_name : string ref,
+    string version : string ref
+);
+
+/**
+ * Holds if File `fileid` was provided by package `package`.
+ */
+header_to_external_package(
+    int fileid : @file ref,
+    int package : @external_package ref
+);
+
+/*
+ * C++ dbscheme
+ */
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+/*
+case @function.kind of
+  1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+| 6 = @builtin_function     // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+*/
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+| 40 = @decimal32             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+/*
+case @type_operator.kind of
+|  0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+*/
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+/*
+case @usertype.kind of
+|  0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+*/
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/e70d0b653187b93d9688f21c9db46bb1cd46ab78/upgrade.properties b/cpp/ql/lib/upgrades/e70d0b653187b93d9688f21c9db46bb1cd46ab78/upgrade.properties
new file mode 100644
index 000000000000..6d50eaf29c76
--- /dev/null
+++ b/cpp/ql/lib/upgrades/e70d0b653187b93d9688f21c9db46bb1cd46ab78/upgrade.properties
@@ -0,0 +1,6 @@
+description: sync dbscheme and delete svn tables
+compatibility: full
+svnentries.rel: delete
+svnaffectedfiles.rel: delete
+svnentrymsg.rel: delete
+svnchurn.rel: delete

From 98798b6f739e628d3ef527542124110017d75d46 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Mon, 30 Jun 2025 20:12:49 +0200
Subject: [PATCH 3/3] C++: Update stats file

---
 cpp/ql/lib/semmlecode.cpp.dbscheme.stats | 4950 ++++++++--------------
 1 file changed, 1874 insertions(+), 3076 deletions(-)

diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 2681f0441578..35506ec5824e 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -2,39 +2,35 @@
     <typesizes>
         <e>
             <k>@compilation</k>
-            <v>12644</v>
+            <v>12647</v>
         </e>
         <e>
             <k>@externalDataElement</k>
             <v>65</v>
         </e>
         <e>
-            <k>@external_package</k>
-            <v>4</v>
+            <k>@file</k>
+            <v>65232</v>
         </e>
         <e>
-            <k>@svnentry</k>
-            <v>575525</v>
+            <k>@folder</k>
+            <v>12393</v>
         </e>
         <e>
             <k>@diagnostic</k>
-            <v>1484</v>
+            <v>1483</v>
         </e>
         <e>
-            <k>@file</k>
-            <v>65216</v>
-        </e>
-        <e>
-            <k>@folder</k>
-            <v>12390</v>
+            <k>@external_package</k>
+            <v>4</v>
         </e>
         <e>
             <k>@location_default</k>
-            <v>47502960</v>
+            <v>46965948</v>
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>40257313</v>
+            <v>40257335</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
@@ -42,19 +38,19 @@
         </e>
         <e>
             <k>@function</k>
-            <v>4053070</v>
+            <v>4053072</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4206777</v>
+            <v>4206779</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>9391611</v>
+            <v>9391616</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>1634963</v>
+            <v>1634964</v>
         </e>
         <e>
             <k>@namespace_decl</k>
@@ -62,11 +58,11 @@
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>267964</v>
+            <v>267955</v>
         </e>
         <e>
             <k>@using_directive</k>
-            <v>6473</v>
+            <v>6472</v>
         </e>
         <e>
             <k>@using_enum_declaration</k>
@@ -78,11 +74,11 @@
         </e>
         <e>
             <k>@parameter</k>
-            <v>7026196</v>
+            <v>7026200</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1496814</v>
+            <v>1496815</v>
         </e>
         <e>
             <k>@globalvariable</k>
@@ -346,7 +342,7 @@
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>693866</v>
+            <v>693867</v>
         </e>
         <e>
             <k>@array</k>
@@ -354,11 +350,11 @@
         </e>
         <e>
             <k>@routineptr</k>
-            <v>684108</v>
+            <v>684076</v>
         </e>
         <e>
             <k>@reference</k>
-            <v>968191</v>
+            <v>968192</v>
         </e>
         <e>
             <k>@gnu_vector</k>
@@ -382,7 +378,7 @@
         </e>
         <e>
             <k>@type_operator</k>
-            <v>7961</v>
+            <v>7953</v>
         </e>
         <e>
             <k>@decltype</k>
@@ -390,27 +386,27 @@
         </e>
         <e>
             <k>@usertype</k>
-            <v>4151872</v>
+            <v>4151861</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6370038</v>
+            <v>6370041</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>5902896</v>
+            <v>5902899</v>
         </e>
         <e>
             <k>@concept_template</k>
-            <v>3614</v>
+            <v>3611</v>
         </e>
         <e>
             <k>@routinetype</k>
-            <v>604318</v>
+            <v>604289</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>9728</v>
+            <v>9730</v>
         </e>
         <e>
             <k>@specifier</k>
@@ -418,7 +414,7 @@
         </e>
         <e>
             <k>@gnuattribute</k>
-            <v>559629</v>
+            <v>559628</v>
         </e>
         <e>
             <k>@stdattribute</k>
@@ -442,11 +438,11 @@
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>71909</v>
+            <v>71994</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
-            <v>1404</v>
+            <v>1405</v>
         </e>
         <e>
             <k>@attribute_arg_empty</k>
@@ -462,19 +458,19 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>476900</v>
+            <v>476877</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>700455</v>
+            <v>700420</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>11241963</v>
+            <v>11241970</v>
         </e>
         <e>
             <k>@namespace</k>
-            <v>8651</v>
+            <v>8653</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
@@ -482,31 +478,31 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>3042067</v>
+            <v>3038986</v>
         </e>
         <e>
             <k>@value</k>
-            <v>13474604</v>
+            <v>13474612</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>2251034</v>
+            <v>2251036</v>
         </e>
         <e>
             <k>@address_of</k>
-            <v>595217</v>
+            <v>595216</v>
         </e>
         <e>
             <k>@indirect</k>
-            <v>404153</v>
+            <v>404154</v>
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1953751</v>
+            <v>1953752</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>4915208</v>
+            <v>4915210</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -562,7 +558,7 @@
         </e>
         <e>
             <k>@remexpr</k>
-            <v>16012</v>
+            <v>16011</v>
         </e>
         <e>
             <k>@paddexpr</k>
@@ -582,7 +578,7 @@
         </e>
         <e>
             <k>@rshiftexpr</k>
-            <v>200554</v>
+            <v>200555</v>
         </e>
         <e>
             <k>@andexpr</k>
@@ -622,7 +618,7 @@
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>1281144</v>
+            <v>1281145</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -634,7 +630,7 @@
         </e>
         <e>
             <k>@assignmulexpr</k>
-            <v>11186</v>
+            <v>11189</v>
         </e>
         <e>
             <k>@assigndivexpr</k>
@@ -682,15 +678,15 @@
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>168440</v>
+            <v>168441</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>435142</v>
+            <v>435143</v>
         </e>
         <e>
             <k>@callexpr</k>
-            <v>239778</v>
+            <v>239767</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -710,7 +706,7 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>8254631</v>
+            <v>8254635</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
@@ -718,7 +714,7 @@
         </e>
         <e>
             <k>@runtime_alignof</k>
-            <v>49877</v>
+            <v>49874</v>
         </e>
         <e>
             <k>@expr_stmt</k>
@@ -726,11 +722,11 @@
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>5732629</v>
+            <v>5726803</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1405363</v>
+            <v>1405364</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
@@ -742,31 +738,31 @@
         </e>
         <e>
             <k>@literal</k>
-            <v>7967932</v>
+            <v>7967517</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
-            <v>1397523</v>
+            <v>1397521</v>
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>6026998</v>
+            <v>6026988</v>
         </e>
         <e>
             <k>@temp_init</k>
-            <v>992092</v>
+            <v>992325</v>
         </e>
         <e>
             <k>@errorexpr</k>
-            <v>45686</v>
+            <v>45684</v>
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1903048</v>
+            <v>1902638</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2107314</v>
+            <v>2107213</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
@@ -826,23 +822,23 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1558309</v>
+            <v>1558310</v>
         </e>
         <e>
             <k>@new_expr</k>
-            <v>46197</v>
+            <v>46195</v>
         </e>
         <e>
             <k>@delete_expr</k>
-            <v>11481</v>
+            <v>11480</v>
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>24156</v>
+            <v>24105</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>408935</v>
+            <v>408518</v>
         </e>
         <e>
             <k>@braced_init_list</k>
@@ -850,7 +846,7 @@
         </e>
         <e>
             <k>@type_id</k>
-            <v>47901</v>
+            <v>47898</v>
         </e>
         <e>
             <k>@sizeof_pack</k>
@@ -902,7 +898,7 @@
         </e>
         <e>
             <k>@isbaseofexpr</k>
-            <v>258</v>
+            <v>257</v>
         </e>
         <e>
             <k>@isclassexpr</k>
@@ -954,15 +950,15 @@
         </e>
         <e>
             <k>@foldexpr</k>
-            <v>1248</v>
+            <v>1246</v>
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>112837</v>
+            <v>112831</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
-            <v>4020</v>
+            <v>4019</v>
         </e>
         <e>
             <k>@ctorfieldinit</k>
@@ -974,15 +970,15 @@
         </e>
         <e>
             <k>@dtordirectdestruct</k>
-            <v>39452</v>
+            <v>39450</v>
         </e>
         <e>
             <k>@dtorvirtualdestruct</k>
-            <v>3986</v>
+            <v>3985</v>
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>39826</v>
+            <v>39824</v>
         </e>
         <e>
             <k>@static_cast</k>
@@ -994,7 +990,7 @@
         </e>
         <e>
             <k>@const_cast</k>
-            <v>24461</v>
+            <v>24460</v>
         </e>
         <e>
             <k>@dynamic_cast</k>
@@ -1006,7 +1002,7 @@
         </e>
         <e>
             <k>@param_ref</k>
-            <v>163951</v>
+            <v>164014</v>
         </e>
         <e>
             <k>@noopexpr</k>
@@ -1038,7 +1034,7 @@
         </e>
         <e>
             <k>@istrivialexpr</k>
-            <v>3367</v>
+            <v>3368</v>
         </e>
         <e>
             <k>@isstandardlayoutexpr</k>
@@ -1106,11 +1102,11 @@
         </e>
         <e>
             <k>@isfinalexpr</k>
-            <v>9403</v>
+            <v>9402</v>
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>28345</v>
+            <v>28356</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1138,7 +1134,7 @@
         </e>
         <e>
             <k>@spaceshipexpr</k>
-            <v>1312</v>
+            <v>1311</v>
         </e>
         <e>
             <k>@co_await</k>
@@ -1158,7 +1154,7 @@
         </e>
         <e>
             <k>@hasuniqueobjectrepresentations</k>
-            <v>43</v>
+            <v>42</v>
         </e>
         <e>
             <k>@builtinbitcast</k>
@@ -1174,7 +1170,7 @@
         </e>
         <e>
             <k>@issame</k>
-            <v>4540</v>
+            <v>4535</v>
         </e>
         <e>
             <k>@isfunction</k>
@@ -1282,7 +1278,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>847070</v>
+            <v>846206</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1338,7 +1334,7 @@
         </e>
         <e>
             <k>@referenceconstructsfromtemporary</k>
-            <v>43</v>
+            <v>42</v>
         </e>
         <e>
             <k>@referenceconvertsfromtemporary</k>
@@ -1346,7 +1342,7 @@
         </e>
         <e>
             <k>@isconvertible</k>
-            <v>129</v>
+            <v>128</v>
         </e>
         <e>
             <k>@isvalidwinrttype</k>
@@ -1382,19 +1378,19 @@
         </e>
         <e>
             <k>@requires_expr</k>
-            <v>16503</v>
+            <v>16486</v>
         </e>
         <e>
             <k>@nested_requirement</k>
-            <v>688</v>
+            <v>687</v>
         </e>
         <e>
             <k>@compound_requirement</k>
-            <v>10952</v>
+            <v>10941</v>
         </e>
         <e>
             <k>@concept_id</k>
-            <v>90437</v>
+            <v>90344</v>
         </e>
         <e>
             <k>@lambdacapture</k>
@@ -1402,27 +1398,27 @@
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>2031614</v>
+            <v>2031615</v>
         </e>
         <e>
             <k>@stmt_if</k>
-            <v>990214</v>
+            <v>990215</v>
         </e>
         <e>
             <k>@stmt_while</k>
-            <v>39647</v>
+            <v>39648</v>
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>157918</v>
+            <v>157956</v>
         </e>
         <e>
             <k>@stmt_label</k>
-            <v>78029</v>
+            <v>78048</v>
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1241901</v>
+            <v>1241843</v>
         </e>
         <e>
             <k>@stmt_block</k>
@@ -1438,11 +1434,11 @@
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>836182</v>
+            <v>835329</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>411883</v>
+            <v>411463</v>
         </e>
         <e>
             <k>@stmt_asm</k>
@@ -1450,11 +1446,11 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>772440</v>
+            <v>772441</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>429420</v>
+            <v>428982</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1466,7 +1462,7 @@
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>26748</v>
+            <v>26698</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
@@ -1486,11 +1482,11 @@
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>6385</v>
+            <v>6387</v>
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>43790</v>
+            <v>43746</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
@@ -1526,7 +1522,7 @@
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>21918</v>
+            <v>21923</v>
         </e>
         <e>
             <k>@ppd_else</k>
@@ -1534,15 +1530,15 @@
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>889777</v>
+            <v>889778</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>318582</v>
+            <v>318660</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2752616</v>
+            <v>2752618</v>
         </e>
         <e>
             <k>@ppd_undef</k>
@@ -1616,11 +1612,11 @@
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>12644</cardinality>
+            <cardinality>12647</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12644</v>
+                    <v>12647</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1638,7 +1634,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12644</v>
+                                    <v>12647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1664,11 +1660,11 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1012270</cardinality>
+            <cardinality>1012517</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12644</v>
+                    <v>12647</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -1676,7 +1672,7 @@
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29270</v>
+                    <v>29277</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1715,7 +1711,7 @@
                                 <b>
                                     <a>51</a>
                                     <b>70</b>
-                                    <v>485</v>
+                                    <v>486</v>
                                 </b>
                                 <b>
                                     <a>71</a>
@@ -1725,7 +1721,7 @@
                                 <b>
                                     <a>72</a>
                                     <b>90</b>
-                                    <v>897</v>
+                                    <v>898</v>
                                 </b>
                                 <b>
                                     <a>94</a>
@@ -1750,7 +1746,7 @@
                                 <b>
                                     <a>104</a>
                                     <b>119</b>
-                                    <v>1066</v>
+                                    <v>1067</v>
                                 </b>
                                 <b>
                                     <a>120</a>
@@ -1781,7 +1777,7 @@
                                 <b>
                                     <a>38</a>
                                     <b>39</b>
-                                    <v>1499</v>
+                                    <v>1500</v>
                                 </b>
                                 <b>
                                     <a>39</a>
@@ -1791,7 +1787,7 @@
                                 <b>
                                     <a>40</a>
                                     <b>42</b>
-                                    <v>1087</v>
+                                    <v>1088</v>
                                 </b>
                                 <b>
                                     <a>42</a>
@@ -1806,7 +1802,7 @@
                                 <b>
                                     <a>54</a>
                                     <b>63</b>
-                                    <v>897</v>
+                                    <v>898</v>
                                 </b>
                                 <b>
                                     <a>64</a>
@@ -1816,17 +1812,17 @@
                                 <b>
                                     <a>67</a>
                                     <b>68</b>
-                                    <v>1404</v>
+                                    <v>1405</v>
                                 </b>
                                 <b>
                                     <a>68</a>
                                     <b>70</b>
-                                    <v>971</v>
+                                    <v>972</v>
                                 </b>
                                 <b>
                                     <a>70</a>
                                     <b>71</b>
-                                    <v>1404</v>
+                                    <v>1405</v>
                                 </b>
                                 <b>
                                     <a>73</a>
@@ -2004,12 +2000,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13404</v>
+                                    <v>13407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12686</v>
+                                    <v>12689</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2035,17 +2031,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19383</v>
+                                    <v>19387</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8725</v>
+                                    <v>8727</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>62</b>
-                                    <v>1161</v>
+                                    <v>1162</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2055,11 +2051,11 @@
         </relation>
         <relation>
             <name>compilation_build_mode</name>
-            <cardinality>12644</cardinality>
+            <cardinality>12647</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12644</v>
+                    <v>12647</v>
                 </e>
                 <e>
                     <k>mode</k>
@@ -2077,7 +2073,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12644</v>
+                                    <v>12647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2365,7 +2361,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>19824</v>
+                    <v>13234</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2446,46 +2442,51 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1143</v>
+                                    <v>653</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>217</v>
+                                    <v>708</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>8</b>
-                                    <v>217</v>
+                                    <b>7</b>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>8</a>
+                                    <b>9</b>
+                                    <v>163</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
                                     <b>11</b>
-                                    <v>217</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>12</b>
+                                    <b>13</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>18</b>
+                                    <a>14</a>
+                                    <b>17</b>
                                     <v>163</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>20</b>
-                                    <v>217</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>44</b>
+                                    <b>43</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>133</b>
+                                    <a>47</a>
+                                    <b>92</b>
                                     <v>108</v>
                                 </b>
                             </bs>
@@ -2554,17 +2555,17 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1524</v>
+                                    <v>1361</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>871</v>
+                                    <v>1034</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>272</v>
+                                    <v>326</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -2574,27 +2575,27 @@
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>272</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>217</v>
+                                    <v>326</v>
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>15</b>
+                                    <b>17</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>47</b>
+                                    <a>23</a>
+                                    <b>48</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>97</b>
-                                    <v>108</v>
+                                    <a>91</a>
+                                    <b>92</b>
+                                    <v>54</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2640,23 +2641,23 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
+                                    <a>3</a>
+                                    <b>4</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>6</b>
+                                    <a>4</a>
+                                    <b>5</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>191</a>
-                                    <b>192</b>
+                                    <a>136</a>
+                                    <b>137</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>213</a>
-                                    <b>214</b>
+                                    <a>150</a>
+                                    <b>151</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -2673,22 +2674,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14214</v>
+                                    <v>6862</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3594</v>
+                                    <v>2886</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>5</b>
-                                    <v>1742</v>
+                                    <b>4</b>
+                                    <v>1906</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>39</b>
-                                    <v>272</v>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1198</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>47</b>
+                                    <v>381</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2704,22 +2710,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13125</v>
+                                    <v>6099</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3866</v>
+                                    <v>2723</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1579</v>
+                                    <v>1797</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>56</b>
-                                    <v>1252</v>
+                                    <b>5</b>
+                                    <v>925</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>1089</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>75</b>
+                                    <v>599</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2735,12 +2751,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17155</v>
+                                    <v>10511</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2668</v>
+                                    <v>2723</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2750,15 +2766,15 @@
         </relation>
         <relation>
             <name>diagnostic_for</name>
-            <cardinality>4152</cardinality>
+            <cardinality>4148</cardinality>
             <columnsizes>
                 <e>
                     <k>diagnostic</k>
-                    <v>1484</v>
+                    <v>1483</v>
                 </e>
                 <e>
                     <k>compilation</k>
-                    <v>1355</v>
+                    <v>1354</v>
                 </e>
                 <e>
                     <k>file_number</k>
@@ -2780,12 +2796,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1441</v>
+                                    <v>1440</v>
                                 </b>
                                 <b>
                                     <a>63</a>
                                     <b>64</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2801,7 +2817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1484</v>
+                                    <v>1483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2817,7 +2833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1484</v>
+                                    <v>1483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2833,12 +2849,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1312</v>
+                                    <v>1311</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2854,7 +2870,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1355</v>
+                                    <v>1354</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2870,12 +2886,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1312</v>
+                                    <v>1311</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2939,12 +2955,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                                 <b>
                                     <a>63</a>
@@ -2965,7 +2981,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                                 <b>
                                     <a>63</a>
@@ -2996,19 +3012,19 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>12644</cardinality>
+            <cardinality>12647</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12644</v>
+                    <v>12647</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>9496</v>
+                    <v>9625</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>211</v>
+                    <v>221</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3022,7 +3038,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12644</v>
+                                    <v>12647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3038,7 +3054,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12644</v>
+                                    <v>12647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3054,17 +3070,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7996</v>
+                                    <v>8262</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1098</v>
+                                    <v>919</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>35</b>
-                                    <v>401</v>
+                                    <b>34</b>
+                                    <v>443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3080,12 +3096,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8799</v>
+                                    <v>9023</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>697</v>
+                                    <v>602</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3101,36 +3117,26 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42</v>
+                                    <v>63</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
+                                    <a>7</a>
+                                    <b>8</b>
                                     <v>21</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>11</a>
+                                    <b>12</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -3139,33 +3145,38 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>29</a>
-                                    <b>30</b>
+                                    <a>21</a>
+                                    <b>22</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>53</a>
-                                    <b>54</b>
+                                    <a>28</a>
+                                    <b>29</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>171</a>
-                                    <b>172</b>
+                                    <a>56</a>
+                                    <b>57</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>241</a>
-                                    <b>242</b>
+                                    <a>153</a>
+                                    <b>154</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>296</a>
-                                    <b>297</b>
+                                    <a>248</a>
+                                    <b>249</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>319</a>
-                                    <b>320</b>
+                                    <a>297</a>
+                                    <b>298</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>323</a>
+                                    <b>324</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -3182,36 +3193,26 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42</v>
+                                    <v>63</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
+                                    <a>7</a>
+                                    <b>8</b>
                                     <v>21</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>13</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
+                                    <a>11</a>
+                                    <b>12</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -3220,33 +3221,38 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>29</a>
-                                    <b>30</b>
+                                    <a>21</a>
+                                    <b>22</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>52</a>
-                                    <b>53</b>
+                                    <a>27</a>
+                                    <b>28</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>160</a>
-                                    <b>161</b>
+                                    <a>54</a>
+                                    <b>55</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>162</a>
-                                    <b>163</b>
+                                    <a>152</a>
+                                    <b>153</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>225</a>
-                                    <b>226</b>
+                                    <a>163</a>
+                                    <b>164</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>249</a>
-                                    <b>250</b>
+                                    <a>229</a>
+                                    <b>230</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>251</a>
+                                    <b>252</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -3483,238 +3489,38 @@
             <dependencies/>
         </relation>
         <relation>
-            <name>external_packages</name>
-            <cardinality>4</cardinality>
+            <name>locations_default</name>
+            <cardinality>46965948</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4</v>
+                    <v>46965948</v>
                 </e>
                 <e>
-                    <k>namespace</k>
-                    <v>1</v>
+                    <k>file</k>
+                    <v>40955</v>
                 </e>
                 <e>
-                    <k>package_name</k>
-                    <v>4</v>
+                    <k>beginLine</k>
+                    <v>7507424</v>
                 </e>
                 <e>
-                    <k>version</k>
-                    <v>4</v>
+                    <k>beginColumn</k>
+                    <v>21975</v>
                 </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>namespace</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>package_name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>version</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>namespace</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>namespace</src>
-                    <trg>package_name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>namespace</src>
-                    <trg>version</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>package_name</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>package_name</src>
-                    <trg>namespace</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>package_name</src>
-                    <trg>version</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>version</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>version</src>
-                    <trg>namespace</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>version</src>
-                    <trg>package_name</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>4</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>header_to_external_package</name>
-            <cardinality>92</cardinality>
-            <columnsizes>
                 <e>
-                    <k>fileid</k>
-                    <v>92</v>
+                    <k>endLine</k>
+                    <v>7508548</v>
                 </e>
                 <e>
-                    <k>package</k>
-                    <v>4</v>
+                    <k>endColumn</k>
+                    <v>53441</v>
                 </e>
             </columnsizes>
             <dependencies>
                 <dep>
-                    <src>fileid</src>
-                    <trg>package</trg>
+                    <src>id</src>
+                    <trg>file</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -3722,74 +3528,15 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>92</v>
+                                    <v>46965948</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
-                <dep>
-                    <src>package</src>
-                    <trg>fileid</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>1</v>
-                                </b>
-                                <b>
-                                    <a>80</a>
-                                    <b>81</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>svnentries</name>
-            <cardinality>575525</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>575525</v>
-                </e>
-                <e>
-                    <k>revision</k>
-                    <v>575525</v>
-                </e>
-                <e>
-                    <k>author</k>
-                    <v>19539</v>
-                </e>
-                <e>
-                    <k>revisionDate</k>
-                    <v>547759</v>
-                </e>
-                <e>
-                    <k>changeSize</k>
-                    <v>1</v>
-                </e>
-            </columnsizes>
-            <dependencies>
                 <dep>
                     <src>id</src>
-                    <trg>revision</trg>
+                    <trg>beginLine</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -3797,7 +3544,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>575525</v>
+                                    <v>46965948</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3805,7 +3552,7 @@
                 </dep>
                 <dep>
                     <src>id</src>
-                    <trg>author</trg>
+                    <trg>beginColumn</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -3813,1283 +3560,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>575525</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>revisionDate</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>575525</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>changeSize</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>575525</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>revision</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>575525</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>revision</src>
-                    <trg>author</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>575525</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>revision</src>
-                    <trg>revisionDate</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>575525</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>revision</src>
-                    <trg>changeSize</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>575525</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>author</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7913</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2531</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1388</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>1523</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>10</b>
-                                    <v>1529</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>20</b>
-                                    <v>1509</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>52</b>
-                                    <v>1488</v>
-                                </b>
-                                <b>
-                                    <a>52</a>
-                                    <b>568</b>
-                                    <v>1466</v>
-                                </b>
-                                <b>
-                                    <a>569</a>
-                                    <b>16582</b>
-                                    <v>192</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>author</src>
-                    <trg>revision</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7913</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2531</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1388</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>1523</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>10</b>
-                                    <v>1529</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>20</b>
-                                    <v>1509</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>52</b>
-                                    <v>1488</v>
-                                </b>
-                                <b>
-                                    <a>52</a>
-                                    <b>568</b>
-                                    <v>1466</v>
-                                </b>
-                                <b>
-                                    <a>569</a>
-                                    <b>16582</b>
-                                    <v>192</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>author</src>
-                    <trg>revisionDate</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>7996</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2509</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1379</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>1520</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>10</b>
-                                    <v>1529</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>20</b>
-                                    <v>1507</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>52</b>
-                                    <v>1474</v>
-                                </b>
-                                <b>
-                                    <a>52</a>
-                                    <b>662</b>
-                                    <v>1466</v>
-                                </b>
-                                <b>
-                                    <a>663</a>
-                                    <b>16573</b>
-                                    <v>159</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>author</src>
-                    <trg>changeSize</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>19539</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>revisionDate</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>531878</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>100</b>
-                                    <v>15881</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>revisionDate</src>
-                    <trg>revision</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>531878</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>100</b>
-                                    <v>15881</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>revisionDate</src>
-                    <trg>author</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>542505</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>17</b>
-                                    <v>5254</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>revisionDate</src>
-                    <trg>changeSize</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>547759</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>changeSize</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>575525</a>
-                                    <b>575526</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>changeSize</src>
-                    <trg>revision</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>575525</a>
-                                    <b>575526</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>changeSize</src>
-                    <trg>author</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>19539</a>
-                                    <b>19540</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>changeSize</src>
-                    <trg>revisionDate</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>547759</a>
-                                    <b>547760</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>svnaffectedfiles</name>
-            <cardinality>1314068</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>531628</v>
-                </e>
-                <e>
-                    <k>file</k>
-                    <v>90924</v>
-                </e>
-                <e>
-                    <k>action</k>
-                    <v>1</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>337698</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>77525</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>43024</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>46689</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>16635</b>
-                                    <v>26692</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>action</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>531628</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>11819</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>18230</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>9501</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>6656</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>5012</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>8</b>
-                                    <v>7103</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>11</b>
-                                    <v>6788</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>16</b>
-                                    <v>6996</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>26</b>
-                                    <v>7180</v>
-                                </b>
-                                <b>
-                                    <a>26</a>
-                                    <b>54</b>
-                                    <v>6824</v>
-                                </b>
-                                <b>
-                                    <a>54</a>
-                                    <b>3572</b>
-                                    <v>4815</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>action</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>90924</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>action</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>531628</a>
-                                    <b>531629</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>action</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>90924</a>
-                                    <b>90925</b>
-                                    <v>1</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>svnentrymsg</name>
-            <cardinality>575525</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>575525</v>
-                </e>
-                <e>
-                    <k>message</k>
-                    <v>568305</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>message</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>575525</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>message</src>
-                    <trg>id</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>565381</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>142</b>
-                                    <v>2924</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>svnchurn</name>
-            <cardinality>46790</cardinality>
-            <columnsizes>
-                <e>
-                    <k>commit</k>
-                    <v>22361</v>
-                </e>
-                <e>
-                    <k>file</k>
-                    <v>16124</v>
-                </e>
-                <e>
-                    <k>addedLines</k>
-                    <v>910</v>
-                </e>
-                <e>
-                    <k>deletedLines</k>
-                    <v>787</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>commit</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>15208</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3101</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1746</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>1774</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>246</b>
-                                    <v>532</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>commit</src>
-                    <trg>addedLines</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16074</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3323</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1561</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>118</b>
-                                    <v>1403</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>commit</src>
-                    <trg>deletedLines</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>16799</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3286</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>5</b>
-                                    <v>1763</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>113</b>
-                                    <v>513</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>commit</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>8618</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>2956</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1426</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>1364</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>12</b>
-                                    <v>1210</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>448</b>
-                                    <v>550</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>addedLines</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9240</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3129</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1393</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>1239</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>59</b>
-                                    <v>1123</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>file</src>
-                    <trg>deletedLines</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>9525</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>3192</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>1401</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>1387</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>70</b>
-                                    <v>619</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>addedLines</src>
-                    <trg>commit</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>446</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>133</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>70</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>68</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>12</b>
-                                    <v>70</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>57</b>
-                                    <v>69</v>
-                                </b>
-                                <b>
-                                    <a>57</a>
-                                    <b>6874</b>
-                                    <v>54</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>addedLines</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>445</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>132</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>69</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>6</b>
-                                    <v>68</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>12</b>
-                                    <v>73</v>
-                                </b>
-                                <b>
-                                    <a>12</a>
-                                    <b>58</b>
-                                    <v>69</v>
-                                </b>
-                                <b>
-                                    <a>58</a>
-                                    <b>6663</b>
-                                    <v>54</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>addedLines</src>
-                    <trg>deletedLines</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>621</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>96</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>7</b>
-                                    <v>81</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>34</b>
-                                    <v>70</v>
-                                </b>
-                                <b>
-                                    <a>34</a>
-                                    <b>727</b>
-                                    <v>42</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>deletedLines</src>
-                    <trg>commit</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>439</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>116</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>48</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>8</b>
-                                    <v>67</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>28</b>
-                                    <v>60</v>
-                                </b>
-                                <b>
-                                    <a>28</a>
-                                    <b>6794</b>
-                                    <v>57</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>deletedLines</src>
-                    <trg>file</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>437</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>113</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>49</v>
-                                </b>
-                                <b>
-                                    <a>4</a>
-                                    <b>7</b>
-                                    <v>61</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>19</b>
-                                    <v>60</v>
-                                </b>
-                                <b>
-                                    <a>19</a>
-                                    <b>770</b>
-                                    <v>60</v>
-                                </b>
-                                <b>
-                                    <a>985</a>
-                                    <b>7318</b>
-                                    <v>7</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>deletedLines</src>
-                    <trg>addedLines</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>545</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>72</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>7</b>
-                                    <v>69</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>30</b>
-                                    <v>60</v>
-                                </b>
-                                <b>
-                                    <a>30</a>
-                                    <b>871</b>
-                                    <v>41</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>extractor_version</name>
-            <cardinality>124</cardinality>
-            <columnsizes>
-                <e>
-                    <k>codeql_version</k>
-                    <v>124</v>
-                </e>
-                <e>
-                    <k>frontend_version</k>
-                    <v>124</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>codeql_version</src>
-                    <trg>frontend_version</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>124</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>frontend_version</src>
-                    <trg>codeql_version</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>124</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>locations_default</name>
-            <cardinality>47502960</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>47502960</v>
-                </e>
-                <e>
-                    <k>container</k>
-                    <v>40955</v>
-                </e>
-                <e>
-                    <k>startLine</k>
-                    <v>7507420</v>
-                </e>
-                <e>
-                    <k>startColumn</k>
-                    <v>21975</v>
-                </e>
-                <e>
-                    <k>endLine</k>
-                    <v>7508544</v>
-                </e>
-                <e>
-                    <k>endColumn</k>
-                    <v>53441</v>
-                </e>
-            </columnsizes>
-            <dependencies>
-                <dep>
-                    <src>id</src>
-                    <trg>container</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>47502960</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>startLine</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>47502960</v>
-                                </b>
-                            </bs>
-                        </hist>
-                    </val>
-                </dep>
-                <dep>
-                    <src>id</src>
-                    <trg>startColumn</trg>
-                    <val>
-                        <hist>
-                            <budget>12</budget>
-                            <bs>
-                                <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>47502960</v>
+                                    <v>46965948</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5105,7 +3576,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47502960</v>
+                                    <v>46965948</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5121,14 +3592,14 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47502960</v>
+                                    <v>46965948</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>container</src>
+                    <src>file</src>
                     <trg>id</trg>
                     <val>
                         <hist>
@@ -5141,76 +3612,76 @@
                                 </b>
                                 <b>
                                     <a>15</a>
-                                    <b>42</b>
+                                    <b>41</b>
                                     <v>3121</v>
                                 </b>
                                 <b>
                                     <a>42</a>
-                                    <b>73</b>
+                                    <b>72</b>
                                     <v>3121</v>
                                 </b>
                                 <b>
-                                    <a>75</a>
+                                    <a>72</a>
                                     <b>114</b>
-                                    <v>3121</v>
+                                    <v>3371</v>
                                 </b>
                                 <b>
                                     <a>114</a>
                                     <b>142</b>
-                                    <v>3246</v>
+                                    <v>3121</v>
                                 </b>
                                 <b>
-                                    <a>142</a>
-                                    <b>213</b>
+                                    <a>143</a>
+                                    <b>211</b>
                                     <v>3121</v>
                                 </b>
                                 <b>
                                     <a>213</a>
-                                    <b>304</b>
+                                    <b>307</b>
                                     <v>3121</v>
                                 </b>
                                 <b>
                                     <a>310</a>
-                                    <b>423</b>
+                                    <b>430</b>
                                     <v>3121</v>
                                 </b>
                                 <b>
-                                    <a>429</a>
-                                    <b>598</b>
+                                    <a>437</a>
+                                    <b>596</b>
                                     <v>3121</v>
                                 </b>
                                 <b>
-                                    <a>598</a>
-                                    <b>834</b>
+                                    <a>607</a>
+                                    <b>827</b>
                                     <v>3121</v>
                                 </b>
                                 <b>
-                                    <a>838</a>
-                                    <b>1314</b>
+                                    <a>839</a>
+                                    <b>1298</b>
                                     <v>3121</v>
                                 </b>
                                 <b>
-                                    <a>1328</a>
-                                    <b>2780</b>
+                                    <a>1300</a>
+                                    <b>2722</b>
                                     <v>3121</v>
                                 </b>
                                 <b>
-                                    <a>2844</a>
-                                    <b>23269</b>
+                                    <a>3114</a>
+                                    <b>30788</b>
                                     <v>3121</v>
                                 </b>
                                 <b>
-                                    <a>30790</a>
-                                    <b>57883</b>
-                                    <v>249</v>
+                                    <a>57880</a>
+                                    <b>57881</b>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>container</src>
-                    <trg>startLine</trg>
+                    <src>file</src>
+                    <trg>beginLine</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -5285,8 +3756,8 @@
                     </val>
                 </dep>
                 <dep>
-                    <src>container</src>
-                    <trg>startColumn</trg>
+                    <src>file</src>
+                    <trg>beginColumn</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -5361,7 +3832,7 @@
                     </val>
                 </dep>
                 <dep>
-                    <src>container</src>
+                    <src>file</src>
                     <trg>endLine</trg>
                     <val>
                         <hist>
@@ -5437,7 +3908,7 @@
                     </val>
                 </dep>
                 <dep>
-                    <src>container</src>
+                    <src>file</src>
                     <trg>endColumn</trg>
                     <val>
                         <hist>
@@ -5513,7 +3984,7 @@
                     </val>
                 </dep>
                 <dep>
-                    <src>startLine</src>
+                    <src>beginLine</src>
                     <trg>id</trg>
                     <val>
                         <hist>
@@ -5522,17 +3993,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4961952</v>
+                                    <v>4961954</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>779523</v>
+                                    <v>779773</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>542407</v>
+                                    <v>544405</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -5542,20 +4013,20 @@
                                 <b>
                                     <a>12</a>
                                     <b>97</b>
-                                    <v>564008</v>
+                                    <v>563134</v>
                                 </b>
                                 <b>
                                     <a>97</a>
-                                    <b>645</b>
-                                    <v>88653</v>
+                                    <b>637</b>
+                                    <v>87279</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>startLine</src>
-                    <trg>container</trg>
+                    <src>beginLine</src>
+                    <trg>file</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -5563,7 +4034,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5024009</v>
+                                    <v>5024012</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5573,7 +4044,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>640549</v>
+                                    <v>640550</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -5590,8 +4061,8 @@
                     </val>
                 </dep>
                 <dep>
-                    <src>startLine</src>
-                    <trg>startColumn</trg>
+                    <src>beginLine</src>
+                    <trg>beginColumn</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -5599,7 +4070,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5646454</v>
+                                    <v>5646457</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5626,7 +4097,7 @@
                     </val>
                 </dep>
                 <dep>
-                    <src>startLine</src>
+                    <src>beginLine</src>
                     <trg>endLine</trg>
                     <val>
                         <hist>
@@ -5635,7 +4106,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7041179</v>
+                                    <v>7041183</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5647,7 +4118,7 @@
                     </val>
                 </dep>
                 <dep>
-                    <src>startLine</src>
+                    <src>beginLine</src>
                     <trg>endColumn</trg>
                     <val>
                         <hist>
@@ -5656,7 +4127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5031001</v>
+                                    <v>5031004</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5671,7 +4142,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>587482</v>
+                                    <v>587483</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -5688,7 +4159,7 @@
                     </val>
                 </dep>
                 <dep>
-                    <src>startColumn</src>
+                    <src>beginColumn</src>
                     <trg>id</trg>
                     <val>
                         <hist>
@@ -5697,7 +4168,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1623</v>
+                                    <v>1748</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5711,61 +4182,61 @@
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>37</b>
+                                    <b>40</b>
                                     <v>1748</v>
                                 </b>
                                 <b>
-                                    <a>40</a>
-                                    <b>114</b>
+                                    <a>49</a>
+                                    <b>128</b>
                                     <v>1748</v>
                                 </b>
                                 <b>
-                                    <a>128</a>
-                                    <b>241</b>
+                                    <a>129</a>
+                                    <b>253</b>
                                     <v>1748</v>
                                 </b>
                                 <b>
-                                    <a>253</a>
-                                    <b>599</b>
+                                    <a>316</a>
+                                    <b>707</b>
                                     <v>1748</v>
                                 </b>
                                 <b>
-                                    <a>712</a>
-                                    <b>1234</b>
+                                    <a>791</a>
+                                    <b>1267</b>
                                     <v>1748</v>
                                 </b>
                                 <b>
-                                    <a>1268</a>
-                                    <b>1902</b>
+                                    <a>1281</a>
+                                    <b>1943</b>
                                     <v>1748</v>
                                 </b>
                                 <b>
-                                    <a>1952</a>
-                                    <b>2390</b>
+                                    <a>2017</a>
+                                    <b>2398</b>
                                     <v>1748</v>
                                 </b>
                                 <b>
-                                    <a>2424</a>
-                                    <b>3237</b>
+                                    <a>2491</a>
+                                    <b>3203</b>
                                     <v>1748</v>
                                 </b>
                                 <b>
-                                    <a>3272</a>
-                                    <b>7577</b>
+                                    <a>3252</a>
+                                    <b>7915</b>
                                     <v>1748</v>
                                 </b>
                                 <b>
-                                    <a>8002</a>
-                                    <b>121166</b>
-                                    <v>749</v>
+                                    <a>10983</a>
+                                    <b>121029</b>
+                                    <v>624</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>startColumn</src>
-                    <trg>container</trg>
+                    <src>beginColumn</src>
+                    <trg>file</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -5840,8 +4311,8 @@
                     </val>
                 </dep>
                 <dep>
-                    <src>startColumn</src>
-                    <trg>startLine</trg>
+                    <src>beginColumn</src>
+                    <trg>beginLine</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -5916,7 +4387,7 @@
                     </val>
                 </dep>
                 <dep>
-                    <src>startColumn</src>
+                    <src>beginColumn</src>
                     <trg>endLine</trg>
                     <val>
                         <hist>
@@ -5992,7 +4463,7 @@
                     </val>
                 </dep>
                 <dep>
-                    <src>startColumn</src>
+                    <src>beginColumn</src>
                     <trg>endColumn</trg>
                     <val>
                         <hist>
@@ -6077,32 +4548,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4959829</v>
+                                    <v>4959832</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>782020</v>
+                                    <v>782270</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>543156</v>
+                                    <v>545279</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>568129</v>
+                                    <v>568379</v>
                                 </b>
                                 <b>
                                     <a>12</a>
-                                    <b>95</b>
-                                    <v>564383</v>
+                                    <b>96</b>
+                                    <v>564758</v>
                                 </b>
                                 <b>
-                                    <a>95</a>
-                                    <b>628</b>
-                                    <v>91025</v>
+                                    <a>96</a>
+                                    <b>620</b>
+                                    <v>88028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6110,7 +4581,7 @@
                 </dep>
                 <dep>
                     <src>endLine</src>
-                    <trg>container</trg>
+                    <trg>file</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -6118,12 +4589,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5021137</v>
+                                    <v>5021140</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1224911</v>
+                                    <v>1224912</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -6133,7 +4604,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>52</b>
-                                    <v>564632</v>
+                                    <v>564633</v>
                                 </b>
                                 <b>
                                     <a>52</a>
@@ -6146,7 +4617,7 @@
                 </dep>
                 <dep>
                     <src>endLine</src>
-                    <trg>startLine</trg>
+                    <trg>beginLine</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -6154,7 +4625,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7057911</v>
+                                    <v>7057915</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6167,7 +4638,7 @@
                 </dep>
                 <dep>
                     <src>endLine</src>
-                    <trg>startColumn</trg>
+                    <trg>beginColumn</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -6175,7 +4646,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5645580</v>
+                                    <v>5645583</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6185,7 +4656,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>587607</v>
+                                    <v>587608</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -6211,7 +4682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5029628</v>
+                                    <v>5029631</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6221,7 +4692,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>540034</v>
+                                    <v>540035</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -6276,26 +4747,26 @@
                                 </b>
                                 <b>
                                     <a>33</a>
-                                    <b>107</b>
+                                    <b>106</b>
                                     <v>4120</v>
                                 </b>
                                 <b>
-                                    <a>116</a>
-                                    <b>696</b>
+                                    <a>114</a>
+                                    <b>689</b>
                                     <v>4120</v>
                                 </b>
                                 <b>
-                                    <a>726</a>
-                                    <b>2478</b>
+                                    <a>721</a>
+                                    <b>2458</b>
                                     <v>4120</v>
                                 </b>
                                 <b>
-                                    <a>2622</a>
-                                    <b>4791</b>
+                                    <a>2593</a>
+                                    <b>4731</b>
                                     <v>4120</v>
                                 </b>
                                 <b>
-                                    <a>4798</a>
+                                    <a>4759</a>
                                     <b>33780</b>
                                     <v>3121</v>
                                 </b>
@@ -6305,7 +4776,7 @@
                 </dep>
                 <dep>
                     <src>endColumn</src>
-                    <trg>container</trg>
+                    <trg>file</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -6366,7 +4837,7 @@
                 </dep>
                 <dep>
                     <src>endColumn</src>
-                    <trg>startLine</trg>
+                    <trg>beginLine</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -6427,7 +4898,7 @@
                 </dep>
                 <dep>
                     <src>endColumn</src>
-                    <trg>startColumn</trg>
+                    <trg>beginColumn</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -6549,6 +5020,185 @@
                 </dep>
             </dependencies>
         </relation>
+        <relation>
+            <name>files</name>
+            <cardinality>65232</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>65232</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>65232</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>65232</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>65232</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>folders</name>
+            <cardinality>12393</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>12393</v>
+                </e>
+                <e>
+                    <k>name</k>
+                    <v>12393</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>12393</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>12393</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>containerparent</name>
+            <cardinality>77604</cardinality>
+            <columnsizes>
+                <e>
+                    <k>parent</k>
+                    <v>12393</v>
+                </e>
+                <e>
+                    <k>child</k>
+                    <v>77604</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>parent</src>
+                    <trg>child</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>6032</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1521</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>665</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>6</b>
+                                    <v>1003</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>10</b>
+                                    <v>972</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>16</b>
+                                    <v>1003</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>44</b>
+                                    <v>929</v>
+                                </b>
+                                <b>
+                                    <a>44</a>
+                                    <b>151</b>
+                                    <v>264</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>child</src>
+                    <trg>parent</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>77604</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
         <relation>
             <name>numlines</name>
             <cardinality>808616</cardinality>
@@ -6581,7 +5231,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>806368</v>
+                                    <v>806369</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6602,7 +5252,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>806368</v>
+                                    <v>806369</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6623,7 +5273,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>807242</v>
+                                    <v>807243</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6987,11 +5637,11 @@
         </relation>
         <relation>
             <name>diagnostics</name>
-            <cardinality>1484</cardinality>
+            <cardinality>1483</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1484</v>
+                    <v>1483</v>
                 </e>
                 <e>
                     <k>severity</k>
@@ -6999,7 +5649,7 @@
                 </e>
                 <e>
                     <k>error_tag</k>
-                    <v>43</v>
+                    <v>42</v>
                 </e>
                 <e>
                     <k>error_message</k>
@@ -7025,7 +5675,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1484</v>
+                                    <v>1483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7041,7 +5691,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1484</v>
+                                    <v>1483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7057,7 +5707,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1484</v>
+                                    <v>1483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7073,7 +5723,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1484</v>
+                                    <v>1483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7089,7 +5739,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1484</v>
+                                    <v>1483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7206,7 +5856,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7285,7 +5935,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>129</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>63</a>
@@ -7370,7 +6020,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>129</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>63</a>
@@ -7455,7 +6105,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                                 <b>
                                     <a>63</a>
@@ -7513,7 +6163,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7534,7 +6184,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7543,22 +6193,30 @@
             </dependencies>
         </relation>
         <relation>
-            <name>files</name>
-            <cardinality>65216</cardinality>
+            <name>external_packages</name>
+            <cardinality>4</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>65216</v>
+                    <v>4</v>
                 </e>
                 <e>
-                    <k>name</k>
-                    <v>65216</v>
+                    <k>namespace</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>package_name</k>
+                    <v>4</v>
+                </e>
+                <e>
+                    <k>version</k>
+                    <v>4</v>
                 </e>
             </columnsizes>
             <dependencies>
                 <dep>
                     <src>id</src>
-                    <trg>name</trg>
+                    <trg>namespace</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -7566,15 +6224,15 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65216</v>
+                                    <v>4</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>name</src>
-                    <trg>id</trg>
+                    <src>id</src>
+                    <trg>package_name</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -7582,31 +6240,15 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65216</v>
+                                    <v>4</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
-            </dependencies>
-        </relation>
-        <relation>
-            <name>folders</name>
-            <cardinality>12390</cardinality>
-            <columnsizes>
-                <e>
-                    <k>id</k>
-                    <v>12390</v>
-                </e>
-                <e>
-                    <k>name</k>
-                    <v>12390</v>
-                </e>
-            </columnsizes>
-            <dependencies>
                 <dep>
                     <src>id</src>
-                    <trg>name</trg>
+                    <trg>version</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -7614,14 +6256,110 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12390</v>
+                                    <v>4</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>name</src>
+                    <src>namespace</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>namespace</src>
+                    <trg>package_name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>namespace</src>
+                    <trg>version</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package_name</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package_name</src>
+                    <trg>namespace</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package_name</src>
+                    <trg>version</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>version</src>
                     <trg>id</trg>
                     <val>
                         <hist>
@@ -7630,7 +6368,39 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12390</v>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>version</src>
+                    <trg>namespace</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>version</src>
+                    <trg>package_name</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>4</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7639,22 +6409,22 @@
             </dependencies>
         </relation>
         <relation>
-            <name>containerparent</name>
-            <cardinality>77585</cardinality>
+            <name>header_to_external_package</name>
+            <cardinality>92</cardinality>
             <columnsizes>
                 <e>
-                    <k>parent</k>
-                    <v>12390</v>
+                    <k>fileid</k>
+                    <v>92</v>
                 </e>
                 <e>
-                    <k>child</k>
-                    <v>77585</v>
+                    <k>package</k>
+                    <v>4</v>
                 </e>
             </columnsizes>
             <dependencies>
                 <dep>
-                    <src>parent</src>
-                    <trg>child</trg>
+                    <src>fileid</src>
+                    <trg>package</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -7662,50 +6432,78 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6031</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>1521</v>
+                                    <v>92</v>
                                 </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>package</src>
+                    <trg>fileid</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
                                 <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>665</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
+                                    <a>5</a>
                                     <b>6</b>
-                                    <v>1003</v>
+                                    <v>1</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>10</b>
-                                    <v>971</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>16</b>
-                                    <v>1003</v>
+                                    <b>7</b>
+                                    <v>1</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>44</b>
-                                    <v>929</v>
+                                    <a>80</a>
+                                    <b>81</b>
+                                    <v>1</v>
                                 </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>extractor_version</name>
+            <cardinality>124</cardinality>
+            <columnsizes>
+                <e>
+                    <k>codeql_version</k>
+                    <v>124</v>
+                </e>
+                <e>
+                    <k>frontend_version</k>
+                    <v>124</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>codeql_version</src>
+                    <trg>frontend_version</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
                                 <b>
-                                    <a>44</a>
-                                    <b>151</b>
-                                    <v>264</v>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>child</src>
-                    <trg>parent</trg>
+                    <src>frontend_version</src>
+                    <trg>codeql_version</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -7713,7 +6511,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77585</v>
+                                    <v>124</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7723,11 +6521,11 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>4200790</cardinality>
+            <cardinality>4201815</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5767</v>
+                    <v>5768</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -7735,11 +6533,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>58720</v>
+                    <v>58734</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>39516</v>
+                    <v>39526</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7758,7 +6556,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5566</v>
+                                    <v>5568</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7809,7 +6607,7 @@
                                 <b>
                                     <a>550</a>
                                     <b>551</b>
-                                    <v>1330</v>
+                                    <v>1331</v>
                                 </b>
                                 <b>
                                     <a>553</a>
@@ -7829,7 +6627,7 @@
                                 <b>
                                     <a>1234</a>
                                     <b>2155</b>
-                                    <v>242</v>
+                                    <v>243</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7880,7 +6678,7 @@
                                 <b>
                                     <a>706</a>
                                     <b>707</b>
-                                    <v>1330</v>
+                                    <v>1331</v>
                                 </b>
                                 <b>
                                     <a>710</a>
@@ -7984,57 +6782,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11027</v>
+                                    <v>11030</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4362</v>
+                                    <v>4363</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>5059</v>
+                                    <v>5060</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>4098</v>
+                                    <v>4099</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>4594</v>
+                                    <v>4596</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>4330</v>
+                                    <v>4331</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>19</b>
-                                    <v>4890</v>
+                                    <v>4891</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>27</b>
-                                    <v>4256</v>
+                                    <v>4257</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>47</b>
-                                    <v>4837</v>
+                                    <v>4839</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>128</b>
-                                    <v>4922</v>
+                                    <v>4923</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>459</b>
-                                    <v>4626</v>
+                                    <v>4627</v>
                                 </b>
                                 <b>
                                     <a>459</a>
@@ -8055,7 +6853,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58720</v>
+                                    <v>58734</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8071,57 +6869,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11587</v>
+                                    <v>11590</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7689</v>
+                                    <v>7691</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4098</v>
+                                    <v>4099</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4066</v>
+                                    <v>4067</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>3422</v>
+                                    <v>3423</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>4742</v>
+                                    <v>4743</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>17</b>
-                                    <v>5397</v>
+                                    <v>5399</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>23</b>
-                                    <v>4700</v>
+                                    <v>4701</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>41</b>
-                                    <v>4679</v>
+                                    <v>4680</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>95</b>
-                                    <v>4468</v>
+                                    <v>4469</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>1726</b>
-                                    <v>3866</v>
+                                    <v>3867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8172,32 +6970,32 @@
                                 <b>
                                     <a>24</a>
                                     <b>51</b>
-                                    <v>3538</v>
+                                    <v>3539</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>58</b>
-                                    <v>3031</v>
+                                    <v>3032</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>80</b>
-                                    <v>2978</v>
+                                    <v>2979</v>
                                 </b>
                                 <b>
                                     <a>81</a>
                                     <b>151</b>
-                                    <v>3084</v>
+                                    <v>3085</v>
                                 </b>
                                 <b>
                                     <a>151</a>
                                     <b>334</b>
-                                    <v>2978</v>
+                                    <v>2979</v>
                                 </b>
                                 <b>
                                     <a>334</a>
                                     <b>473</b>
-                                    <v>2999</v>
+                                    <v>3000</v>
                                 </b>
                                 <b>
                                     <a>473</a>
@@ -8218,7 +7016,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39505</v>
+                                    <v>39515</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8239,17 +7037,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3401</v>
+                                    <v>3402</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1911</v>
+                                    <v>1912</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3052</v>
+                                    <v>3053</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -8259,7 +7057,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>3485</v>
+                                    <v>3486</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -8269,37 +7067,37 @@
                                 <b>
                                     <a>18</a>
                                     <b>28</b>
-                                    <v>3200</v>
+                                    <v>3201</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>34</b>
-                                    <v>3147</v>
+                                    <v>3148</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>41</b>
-                                    <v>3200</v>
+                                    <v>3201</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>66</b>
-                                    <v>2989</v>
+                                    <v>2990</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>92</b>
-                                    <v>3073</v>
+                                    <v>3074</v>
                                 </b>
                                 <b>
                                     <a>92</a>
                                     <b>113</b>
-                                    <v>2989</v>
+                                    <v>2990</v>
                                 </b>
                                 <b>
                                     <a>113</a>
                                     <b>145</b>
-                                    <v>3031</v>
+                                    <v>3032</v>
                                 </b>
                                 <b>
                                     <a>145</a>
@@ -8314,15 +7112,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>149995954</cardinality>
+            <cardinality>149996022</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24670874</v>
+                    <v>24670888</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3705264</v>
+                    <v>3705273</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8336,37 +7134,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>2209396</v>
+                                    <v>2209400</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1474977</v>
+                                    <v>1474978</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1620369</v>
+                                    <v>1620370</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>6582545</v>
+                                    <v>6582548</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>8719001</v>
+                                    <v>8719004</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>3557049</v>
+                                    <v>3557050</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>22</b>
-                                    <v>507534</v>
+                                    <v>507535</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8382,7 +7180,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>531654</v>
+                                    <v>531662</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8442,15 +7240,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48735840</cardinality>
+            <cardinality>48735860</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7044740</v>
+                    <v>7044743</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3803121</v>
+                    <v>3803123</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8464,7 +7262,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3846709</v>
+                                    <v>3846711</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8474,7 +7272,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>361841</v>
+                                    <v>361842</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -8525,7 +7323,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>342938</v>
+                                    <v>342939</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -8550,7 +7348,7 @@
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>377677</v>
+                                    <v>377678</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -8580,11 +7378,11 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>40338463</cardinality>
+            <cardinality>40338485</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>40338463</v>
+                    <v>40338485</v>
                 </e>
                 <e>
                     <k>macro_id</k>
@@ -8592,7 +7390,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5912754</v>
+                    <v>5912757</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -8610,7 +7408,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40338463</v>
+                                    <v>40338485</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8626,7 +7424,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40338463</v>
+                                    <v>40338485</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8642,7 +7440,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40338463</v>
+                                    <v>40338485</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8734,7 +7532,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>14105</v>
+                                    <v>14106</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -8765,7 +7563,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>177495</v>
+                                    <v>177496</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8786,12 +7584,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5255926</v>
+                                    <v>5255929</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>422362</v>
+                                    <v>422363</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -8812,7 +7610,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5890587</v>
+                                    <v>5890590</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8833,7 +7631,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5912754</v>
+                                    <v>5912757</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8906,15 +7704,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>33655979</cardinality>
+            <cardinality>33655998</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33655979</v>
+                    <v>33655998</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>15926377</v>
+                    <v>15926385</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8928,7 +7726,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33655979</v>
+                                    <v>33655998</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8944,7 +7742,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7806497</v>
+                                    <v>7806501</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8954,7 +7752,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4702906</v>
+                                    <v>4702908</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -8974,15 +7772,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>6882576</cardinality>
+            <cardinality>6058841</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4221836</v>
+                    <v>4241799</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2747083</v>
+                    <v>2277063</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8996,27 +7794,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2459327</v>
+                                    <v>3316469</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1326313</v>
+                                    <v>490781</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8262</v>
+                                    <v>7888</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>413560</v>
+                                    <v>413483</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>17</b>
-                                    <v>14372</v>
+                                    <v>13176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9032,27 +7830,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1394024</v>
+                                    <v>1335697</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>907181</v>
+                                    <v>481667</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8735</v>
+                                    <v>7802</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>410849</v>
+                                    <v>427799</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>522</b>
-                                    <v>26292</v>
+                                    <v>24096</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9062,11 +7860,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>82502296</cardinality>
+            <cardinality>82524830</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26286169</v>
+                    <v>26294983</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -9074,7 +7872,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>343289</v>
+                    <v>343373</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9088,22 +7886,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9682354</v>
+                                    <v>9687115</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9771190</v>
+                                    <v>9773574</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5002549</v>
+                                    <v>5003770</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1830075</v>
+                                    <v>1830521</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9119,22 +7917,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9865000</v>
+                                    <v>9869806</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9788735</v>
+                                    <v>9791124</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4845877</v>
+                                    <v>4847060</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1786555</v>
+                                    <v>1786991</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9159,7 +7957,7 @@
                                 </b>
                                 <b>
                                     <a>646840</a>
-                                    <b>2488495</b>
+                                    <b>2488722</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -9202,57 +8000,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39706</v>
+                                    <v>39716</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>62332</v>
+                                    <v>62347</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>21031</v>
+                                    <v>21036</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>34583</v>
+                                    <v>34591</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>39252</v>
+                                    <v>39261</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>30875</v>
+                                    <v>30883</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>28985</v>
+                                    <v>28992</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>25890</v>
+                                    <v>25896</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>57</b>
-                                    <v>27147</v>
+                                    <v>27153</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>517</b>
-                                    <v>25995</v>
+                                    <v>26002</v>
                                 </b>
                                 <b>
                                     <a>518</a>
                                     <b>486610</b>
-                                    <v>7489</v>
+                                    <v>7491</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9268,17 +8066,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>243193</v>
+                                    <v>243253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>89881</v>
+                                    <v>89903</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>10214</v>
+                                    <v>10216</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9288,11 +8086,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>82502296</cardinality>
+            <cardinality>82524830</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26286169</v>
+                    <v>26294983</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -9300,7 +8098,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>207944</v>
+                    <v>207995</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9314,22 +8112,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9682354</v>
+                                    <v>9687115</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9771190</v>
+                                    <v>9773574</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5002549</v>
+                                    <v>5003770</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1830075</v>
+                                    <v>1830521</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9345,22 +8143,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12641200</v>
+                                    <v>12646684</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8428949</v>
+                                    <v>8431006</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4225571</v>
+                                    <v>4226602</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>990447</v>
+                                    <v>990689</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9385,7 +8183,7 @@
                                 </b>
                                 <b>
                                     <a>646840</a>
-                                    <b>2488495</b>
+                                    <b>2488722</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -9428,57 +8226,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21833</v>
+                                    <v>21839</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26861</v>
+                                    <v>26868</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>43498</v>
+                                    <v>43509</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15908</v>
+                                    <v>15911</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>3263</v>
+                                    <v>3264</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>18400</v>
+                                    <v>18405</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>18971</v>
+                                    <v>18975</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>18326</v>
+                                    <v>18331</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>51</b>
-                                    <v>15781</v>
+                                    <v>15785</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>252</b>
-                                    <v>15601</v>
+                                    <v>15605</v>
                                 </b>
                                 <b>
                                     <a>252</a>
-                                    <b>1169400</b>
-                                    <v>9496</v>
+                                    <b>1169625</b>
+                                    <v>9498</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9494,17 +8292,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105092</v>
+                                    <v>105117</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>88920</v>
+                                    <v>88941</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>66</b>
-                                    <v>13932</v>
+                                    <v>13936</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9514,15 +8312,15 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4053070</cardinality>
+            <cardinality>4053072</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4053070</v>
+                    <v>4053072</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1694897</v>
+                    <v>1694898</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -9540,7 +8338,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4053070</v>
+                                    <v>4053072</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9556,7 +8354,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4053070</v>
+                                    <v>4053072</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9572,12 +8370,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1448541</v>
+                                    <v>1448542</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>139097</v>
+                                    <v>139098</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -9598,7 +8396,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1692025</v>
+                                    <v>1692026</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9715,15 +8513,15 @@
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1141555</cardinality>
+            <cardinality>1141500</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1137808</v>
+                    <v>1137753</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1141555</v>
+                    <v>1141500</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9737,7 +8535,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1134605</v>
+                                    <v>1134551</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9758,7 +8556,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1141555</v>
+                                    <v>1141500</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9768,11 +8566,11 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4070551</cardinality>
+            <cardinality>4070553</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4053070</v>
+                    <v>4053072</v>
                 </e>
                 <e>
                     <k>return_type</k>
@@ -9790,7 +8588,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4035589</v>
+                                    <v>4035591</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10122,33 +8920,33 @@
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>88091</cardinality>
+            <cardinality>88001</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>88091</v>
+                    <v>88001</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>51684</cardinality>
+            <cardinality>51631</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>51684</v>
+                    <v>51631</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>4051572</cardinality>
+            <cardinality>4051574</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4051572</v>
+                    <v>4051574</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -10306,15 +9104,15 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4212770</cardinality>
+            <cardinality>4212773</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4206777</v>
+                    <v>4206779</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4028472</v>
+                    <v>4028474</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -10322,11 +9120,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1693399</v>
+                    <v>1693400</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2815797</v>
+                    <v>2815799</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10340,7 +9138,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4206777</v>
+                                    <v>4206779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10356,7 +9154,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4200784</v>
+                                    <v>4200786</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10377,7 +9175,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4206777</v>
+                                    <v>4206779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10393,7 +9191,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4206777</v>
+                                    <v>4206779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10409,7 +9207,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3864776</v>
+                                    <v>3864778</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10430,7 +9228,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4009992</v>
+                                    <v>4009994</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10451,7 +9249,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4028472</v>
+                                    <v>4028474</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10467,7 +9265,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3885253</v>
+                                    <v>3885256</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10596,7 +9394,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>69548</v>
+                                    <v>69549</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10622,7 +9420,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1332543</v>
+                                    <v>1332544</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10653,7 +9451,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1448042</v>
+                                    <v>1448043</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10679,7 +9477,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1603497</v>
+                                    <v>1603498</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10700,7 +9498,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1368504</v>
+                                    <v>1368505</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10726,12 +9524,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2422477</v>
+                                    <v>2422478</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>251724</v>
+                                    <v>251725</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10752,7 +9550,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2441207</v>
+                                    <v>2441208</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10778,7 +9576,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2701297</v>
+                                    <v>2701299</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10799,7 +9597,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2776590</v>
+                                    <v>2776592</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10814,11 +9612,11 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1423569</cardinality>
+            <cardinality>1423570</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1423569</v>
+                    <v>1423570</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -10847,11 +9645,11 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>4283568</cardinality>
+            <cardinality>4283570</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1749837</v>
+                    <v>1749838</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -10879,7 +9677,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1101171</v>
+                                    <v>1101172</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -11092,15 +9890,15 @@
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>141829</cardinality>
+            <cardinality>141823</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>141829</v>
+                    <v>141823</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>141352</v>
+                    <v>141346</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11114,7 +9912,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>141829</v>
+                                    <v>141823</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11130,7 +9928,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>140910</v>
+                                    <v>140903</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11254,19 +10052,19 @@
         </relation>
         <relation>
             <name>fun_requires</name>
-            <cardinality>29112</cardinality>
+            <cardinality>29083</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10113</v>
+                    <v>10102</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>43</v>
+                    <v>42</v>
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>28876</v>
+                    <v>28846</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11280,7 +10078,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10048</v>
+                                    <v>10038</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11301,7 +10099,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7272</v>
+                                    <v>7265</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11311,7 +10109,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>860</v>
+                                    <v>859</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -11321,7 +10119,7 @@
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>1140</v>
+                                    <v>1139</v>
                                 </b>
                                 <b>
                                     <a>19</a>
@@ -11384,7 +10182,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28639</v>
+                                    <v>28610</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11405,7 +10203,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28876</v>
+                                    <v>28846</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11415,11 +10213,11 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7317003</cardinality>
+            <cardinality>7317007</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7317003</v>
+                    <v>7317007</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -11427,7 +10225,7 @@
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3534886</v>
+                    <v>3534888</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11441,7 +10239,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7317003</v>
+                                    <v>7317007</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11457,7 +10255,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7317003</v>
+                                    <v>7317007</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11555,7 +10353,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1510349</v>
+                                    <v>1510350</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11591,7 +10389,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1510349</v>
+                                    <v>1510350</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11621,19 +10419,19 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>9398478</cardinality>
+            <cardinality>9398483</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9391611</v>
+                    <v>9391616</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>9042867</v>
+                    <v>9042872</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1457781</v>
+                    <v>1457782</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -11641,7 +10439,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6280261</v>
+                    <v>6280264</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11655,7 +10453,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9391611</v>
+                                    <v>9391616</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11671,7 +10469,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9384743</v>
+                                    <v>9384748</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11692,7 +10490,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9391611</v>
+                                    <v>9391616</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11708,7 +10506,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9391611</v>
+                                    <v>9391616</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11724,12 +10522,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8711604</v>
+                                    <v>8711609</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>331262</v>
+                                    <v>331263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11745,7 +10543,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8989300</v>
+                                    <v>8989305</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11766,7 +10564,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8937357</v>
+                                    <v>8937362</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11787,7 +10585,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8791017</v>
+                                    <v>8791022</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11880,7 +10678,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1120525</v>
+                                    <v>1120526</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12029,7 +10827,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>655283</v>
+                                    <v>655284</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12060,7 +10858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>494209</v>
+                                    <v>494210</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12096,7 +10894,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5780058</v>
+                                    <v>5780061</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12122,7 +10920,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5860969</v>
+                                    <v>5860972</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12143,7 +10941,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5981463</v>
+                                    <v>5981466</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12164,7 +10962,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6267899</v>
+                                    <v>6267903</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12179,22 +10977,22 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3770379</cardinality>
+            <cardinality>3770381</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3770379</v>
+                    <v>3770381</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_specialized</name>
-            <cardinality>645</cardinality>
+            <cardinality>644</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>645</v>
+                    <v>644</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -12264,18 +11062,18 @@
         </relation>
         <relation>
             <name>is_structured_binding</name>
-            <cardinality>946</cardinality>
+            <cardinality>945</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>946</v>
+                    <v>945</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>var_requires</name>
-            <cardinality>387</cardinality>
+            <cardinality>386</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -12283,7 +11081,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>387</v>
+                    <v>386</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12323,7 +11121,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>387</v>
+                                    <v>386</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12333,19 +11131,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>1634963</cardinality>
+            <cardinality>1634964</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1634963</v>
+                    <v>1634964</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1615983</v>
+                    <v>1615984</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1548807</v>
+                    <v>1548808</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12359,7 +11157,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1634963</v>
+                                    <v>1634964</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12375,7 +11173,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1634963</v>
+                                    <v>1634964</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12391,7 +11189,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1599626</v>
+                                    <v>1599627</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12412,7 +11210,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1599751</v>
+                                    <v>1599752</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12433,7 +11231,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1526706</v>
+                                    <v>1526707</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12454,7 +11252,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1526831</v>
+                                    <v>1526832</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12469,11 +11267,11 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>1096551</cardinality>
+            <cardinality>1096552</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1096551</v>
+                    <v>1096552</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -12491,15 +11289,15 @@
         </relation>
         <relation>
             <name>type_requires</name>
-            <cardinality>7681</cardinality>
+            <cardinality>7673</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2044</v>
+                    <v>2042</v>
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>7660</v>
+                    <v>7652</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12513,7 +11311,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1011</v>
+                                    <v>1010</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12523,12 +11321,12 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>602</v>
+                                    <v>601</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>13</b>
-                                    <v>172</v>
+                                    <v>171</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -12549,7 +11347,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7638</v>
+                                    <v>7630</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12930,19 +11728,19 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>272115</cardinality>
+            <cardinality>272108</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>272115</v>
+                    <v>272108</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>59068</v>
+                    <v>59009</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>26851</v>
+                    <v>26857</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12960,7 +11758,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>272115</v>
+                                    <v>272108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12976,7 +11774,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>272115</v>
+                                    <v>272108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12992,7 +11790,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>272115</v>
+                                    <v>272108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13008,12 +11806,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51336</v>
+                                    <v>51275</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5387</v>
+                                    <v>5388</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -13034,12 +11832,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51336</v>
+                                    <v>51275</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5387</v>
+                                    <v>5388</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -13060,7 +11858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59068</v>
+                                    <v>59009</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13076,21 +11874,21 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21178</v>
+                                    <v>21184</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2292</v>
+                                    <v>2303</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1954</v>
+                                    <v>1944</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>367</b>
+                                    <b>365</b>
                                     <v>1426</v>
                                 </b>
                             </bs>
@@ -13107,21 +11905,21 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21178</v>
+                                    <v>21184</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2292</v>
+                                    <v>2303</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1954</v>
+                                    <v>1944</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>367</b>
+                                    <b>365</b>
                                     <v>1426</v>
                                 </b>
                             </bs>
@@ -13138,7 +11936,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26851</v>
+                                    <v>26857</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13157,8 +11955,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>25368</a>
-                                    <b>25369</b>
+                                    <a>25361</a>
+                                    <b>25362</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -13178,8 +11976,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>5378</a>
-                                    <b>5379</b>
+                                    <a>5371</a>
+                                    <b>5372</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -13211,15 +12009,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>580209</cardinality>
+            <cardinality>580276</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>21897</v>
+                    <v>21892</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>272115</v>
+                    <v>272108</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13233,7 +12031,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10372</v>
+                                    <v>10375</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13248,12 +12046,12 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2292</v>
+                                    <v>2282</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>28</b>
-                                    <v>1668</v>
+                                    <v>1669</v>
                                 </b>
                                 <b>
                                     <a>28</a>
@@ -13263,7 +12061,7 @@
                                 <b>
                                     <a>145</a>
                                     <b>146</b>
-                                    <v>2619</v>
+                                    <v>2620</v>
                                 </b>
                                 <b>
                                     <a>146</a>
@@ -13284,27 +12082,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96620</v>
+                                    <v>96570</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>120292</v>
+                                    <v>120321</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20101</v>
+                                    <v>20106</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>26714</v>
+                                    <v>26720</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>8387</v>
+                                    <v>8389</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13922,15 +12720,15 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>7067151</cardinality>
+            <cardinality>7067155</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7026196</v>
+                    <v>7026200</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3408025</v>
+                    <v>3408027</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -13952,7 +12750,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7026196</v>
+                                    <v>7026200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13968,7 +12766,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7026196</v>
+                                    <v>7026200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13984,7 +12782,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6985241</v>
+                                    <v>6985244</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14005,17 +12803,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1474513</v>
+                                    <v>1474514</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>927111</v>
+                                    <v>927112</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>579241</v>
+                                    <v>579242</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -14041,17 +12839,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1474513</v>
+                                    <v>1474514</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>927111</v>
+                                    <v>927112</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>579241</v>
+                                    <v>579242</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -14077,12 +12875,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1783301</v>
+                                    <v>1783302</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1031622</v>
+                                    <v>1031623</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14303,7 +13101,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>996036</v>
+                                    <v>996037</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14401,11 +13199,11 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1499265</cardinality>
+            <cardinality>1499266</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1496814</v>
+                    <v>1496815</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -14448,7 +13246,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1496814</v>
+                                    <v>1496815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14567,7 +13365,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>660</b>
-                                    <v>44550</v>
+                                    <v>44551</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14743,7 +13541,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97018</v>
+                                    <v>97019</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15032,15 +13830,15 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>44323</cardinality>
+            <cardinality>44321</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>44323</v>
+                    <v>44321</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>41052</v>
+                    <v>41051</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15054,7 +13852,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44323</v>
+                                    <v>44321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15070,7 +13868,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40201</v>
+                                    <v>40199</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16664,15 +15462,15 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3033684</cardinality>
+            <cardinality>3033686</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3033684</v>
+                    <v>3033686</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1461902</v>
+                    <v>1461903</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16680,7 +15478,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1948495</v>
+                    <v>1948496</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16694,7 +15492,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3033684</v>
+                                    <v>3033686</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16710,7 +15508,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3033684</v>
+                                    <v>3033686</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16726,7 +15524,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3033684</v>
+                                    <v>3033686</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16742,7 +15540,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1345279</v>
+                                    <v>1345280</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16768,7 +15566,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1461902</v>
+                                    <v>1461903</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16784,7 +15582,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1345404</v>
+                                    <v>1345405</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16933,12 +15731,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1318683</v>
+                                    <v>1318684</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>376213</v>
+                                    <v>376214</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16969,7 +15767,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>376213</v>
+                                    <v>376214</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16995,7 +15793,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1320556</v>
+                                    <v>1320557</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17020,11 +15818,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2249416</cardinality>
+            <cardinality>2249417</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2249416</v>
+                    <v>2249417</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -17046,7 +15844,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2249416</v>
+                                    <v>2249417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17062,7 +15860,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2249416</v>
+                                    <v>2249417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17585,15 +16383,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1762387</cardinality>
+            <cardinality>1762320</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1762387</v>
+                    <v>1762320</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>838075</v>
+                    <v>838043</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17607,7 +16405,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1762387</v>
+                                    <v>1762320</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17623,22 +16421,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>662611</v>
+                                    <v>662586</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80934</v>
+                                    <v>80931</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>64160</v>
+                                    <v>64157</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4526</b>
-                                    <v>30368</v>
+                                    <v>30367</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17648,7 +16446,7 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>814475</cardinality>
+            <cardinality>814476</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -17656,7 +16454,7 @@
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>814475</v>
+                    <v>814476</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17786,7 +16584,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814475</v>
+                                    <v>814476</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17802,7 +16600,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814475</v>
+                                    <v>814476</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17818,7 +16616,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814475</v>
+                                    <v>814476</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17834,7 +16632,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814475</v>
+                                    <v>814476</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18096,23 +16894,23 @@
         </relation>
         <relation>
             <name>type_operators</name>
-            <cardinality>7961</cardinality>
+            <cardinality>7953</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7961</v>
+                    <v>7953</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>7186</v>
+                    <v>7179</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>86</v>
+                    <v>85</v>
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>5250</v>
+                    <v>5244</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18126,7 +16924,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7961</v>
+                                    <v>7953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18142,7 +16940,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7961</v>
+                                    <v>7953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18158,7 +16956,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7961</v>
+                                    <v>7953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18174,12 +16972,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6412</v>
+                                    <v>6405</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>774</v>
+                                    <v>773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18195,12 +16993,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6412</v>
+                                    <v>6405</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>774</v>
+                                    <v>773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18216,7 +17014,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7165</v>
+                                    <v>7157</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18330,17 +17128,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3636</v>
+                                    <v>3632</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>903</v>
+                                    <v>902</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>344</v>
+                                    <v>343</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -18361,12 +17159,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3787</v>
+                                    <v>3783</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>989</v>
+                                    <v>988</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18392,12 +17190,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4088</v>
+                                    <v>4084</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1140</v>
+                                    <v>1139</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18412,15 +17210,15 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4151872</cardinality>
+            <cardinality>4151861</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4151872</v>
+                    <v>4151861</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>918586</v>
+                    <v>918789</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -18438,7 +17236,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4151872</v>
+                                    <v>4151861</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18454,7 +17252,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4151872</v>
+                                    <v>4151861</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18470,22 +17268,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654298</v>
+                                    <v>654542</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>158678</v>
+                                    <v>158590</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>70571</v>
+                                    <v>70610</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>32669</b>
-                                    <v>35037</v>
+                                    <v>35046</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18501,12 +17299,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>866838</v>
+                                    <v>867028</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>51748</v>
+                                    <v>51761</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18540,8 +17338,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>1595</a>
-                                    <b>1596</b>
+                                    <a>1594</a>
+                                    <b>1595</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18555,13 +17353,13 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>20079</a>
-                                    <b>20080</b>
+                                    <a>20078</a>
+                                    <b>20079</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>21491</a>
-                                    <b>21492</b>
+                                    <a>21485</a>
+                                    <b>21486</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18570,13 +17368,13 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>92771</a>
-                                    <b>92772</b>
+                                    <a>92762</a>
+                                    <b>92763</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>166844</a>
-                                    <b>166845</b>
+                                    <a>166764</a>
+                                    <b>166765</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18641,8 +17439,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>12189</a>
-                                    <b>12190</b>
+                                    <a>12187</a>
+                                    <b>12188</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18658,15 +17456,15 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1363894</cardinality>
+            <cardinality>1364111</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1363894</v>
+                    <v>1364111</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>1478</v>
+                    <v>1479</v>
                 </e>
                 <e>
                     <k>alignment</k>
@@ -18684,7 +17482,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1363894</v>
+                                    <v>1364111</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18700,7 +17498,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1363894</v>
+                                    <v>1364111</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18755,12 +17553,12 @@
                                 </b>
                                 <b>
                                     <a>118</a>
-                                    <b>1735</b>
+                                    <b>1731</b>
                                     <v>116</v>
                                 </b>
                                 <b>
                                     <a>1839</a>
-                                    <b>99774</b>
+                                    <b>99773</b>
                                     <v>52</v>
                                 </b>
                             </bs>
@@ -18826,18 +17624,18 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>2080</a>
-                                    <b>2081</b>
+                                    <a>2079</a>
+                                    <b>2080</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>11949</a>
-                                    <b>11950</b>
+                                    <a>11940</a>
+                                    <b>11941</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>114969</a>
-                                    <b>114970</b>
+                                    <a>114968</a>
+                                    <b>114969</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18958,11 +17756,11 @@
         </relation>
         <relation>
             <name>usertype_alias_kind</name>
-            <cardinality>1762387</cardinality>
+            <cardinality>1762320</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1762387</v>
+                    <v>1762320</v>
                 </e>
                 <e>
                     <k>alias_kind</k>
@@ -18980,7 +17778,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1762387</v>
+                                    <v>1762320</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19011,26 +17809,26 @@
         </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>766283</cardinality>
+            <cardinality>766246</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>766283</v>
+                    <v>766246</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_template_type_constraint</name>
-            <cardinality>27154</cardinality>
+            <cardinality>27127</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13383</v>
+                    <v>13370</v>
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>26014</v>
+                    <v>25987</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19044,22 +17842,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10220</v>
+                                    <v>10210</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>903</v>
+                                    <v>902</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1032</v>
+                                    <v>1031</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>14</b>
-                                    <v>1118</v>
+                                    <v>1117</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -19080,12 +17878,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24873</v>
+                                    <v>24848</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1140</v>
+                                    <v>1139</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19095,15 +17893,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>7859535</cardinality>
+            <cardinality>7859539</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7859535</v>
+                    <v>7859539</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6370038</v>
+                    <v>6370041</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -19121,7 +17919,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7859535</v>
+                                    <v>7859539</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19137,7 +17935,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7859535</v>
+                                    <v>7859539</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19153,7 +17951,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6041647</v>
+                                    <v>6041650</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19174,7 +17972,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6370038</v>
+                                    <v>6370041</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19226,59 +18024,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>593757</cardinality>
+            <cardinality>593728</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>593757</v>
+                    <v>593728</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1124482</cardinality>
+            <cardinality>1124682</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1124482</v>
+                    <v>1124682</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1346370</cardinality>
+            <cardinality>1346593</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1346370</v>
+                    <v>1346593</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>232187</cardinality>
+            <cardinality>232233</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>232187</v>
+                    <v>232233</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1126140</cardinality>
+            <cardinality>1126267</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1123098</v>
+                    <v>1123214</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>71807</v>
+                    <v>71825</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19292,12 +18090,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1120964</v>
+                                    <v>1121069</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>2133</v>
+                                    <v>2144</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19313,47 +18111,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20492</v>
+                                    <v>20497</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12886</v>
+                                    <v>12890</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7108</v>
+                                    <v>7110</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4658</v>
+                                    <v>4659</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>6073</v>
+                                    <v>6064</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>5725</v>
+                                    <v>5737</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>5904</v>
+                                    <v>5916</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>51</b>
-                                    <v>5397</v>
+                                    <v>5388</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>4223</b>
-                                    <v>3559</v>
+                                    <v>3560</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19363,11 +18161,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2898837</cardinality>
+            <cardinality>2899301</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1367190</v>
+                    <v>1367407</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19375,7 +18173,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>822145</v>
+                    <v>822314</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19389,27 +18187,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>579395</v>
+                                    <v>579515</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>410312</v>
+                                    <v>410328</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>251063</v>
+                                    <v>251124</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>103106</v>
+                                    <v>103120</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>113</b>
-                                    <v>23312</v>
+                                    <v>23318</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19425,22 +18223,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>607937</v>
+                                    <v>608064</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>424319</v>
+                                    <v>424338</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>251897</v>
+                                    <v>251959</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>83036</v>
+                                    <v>83046</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19461,7 +18259,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>749</v>
+                                    <v>750</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -19480,12 +18278,12 @@
                                 </b>
                                 <b>
                                     <a>643</a>
-                                    <b>7128</b>
+                                    <b>7127</b>
                                     <v>95</v>
                                 </b>
                                 <b>
-                                    <a>11968</a>
-                                    <b>129429</b>
+                                    <a>11967</a>
+                                    <b>129418</b>
                                     <v>42</v>
                                 </b>
                             </bs>
@@ -19507,7 +18305,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>749</v>
+                                    <v>750</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -19531,7 +18329,7 @@
                                 </b>
                                 <b>
                                     <a>10413</a>
-                                    <b>44533</b>
+                                    <b>44531</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -19548,27 +18346,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>513746</v>
+                                    <v>513871</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>167657</v>
+                                    <v>167677</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>75092</v>
+                                    <v>75111</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>47</b>
-                                    <v>61741</v>
+                                    <v>61745</v>
                                 </b>
                                 <b>
                                     <a>47</a>
-                                    <b>12618</b>
-                                    <v>3908</v>
+                                    <b>12616</b>
+                                    <v>3909</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19584,17 +18382,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723856</v>
+                                    <v>724001</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79920</v>
+                                    <v>79939</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22</b>
-                                    <v>18369</v>
+                                    <v>18373</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19604,11 +18402,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>510083</cardinality>
+            <cardinality>510059</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>205811</v>
+                    <v>205801</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19616,7 +18414,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>509947</v>
+                    <v>509922</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19630,12 +18428,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>155798</v>
+                                    <v>155790</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>43370</v>
+                                    <v>43367</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -19656,17 +18454,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>147928</v>
+                                    <v>147921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>40474</v>
+                                    <v>40472</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>45</b>
-                                    <v>15535</v>
+                                    <v>15534</v>
                                 </b>
                                 <b>
                                     <a>45</a>
@@ -19799,7 +18597,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>509811</v>
+                                    <v>509786</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19820,7 +18618,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>509947</v>
+                                    <v>509922</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19830,15 +18628,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>48442</cardinality>
+            <cardinality>48454</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>48442</v>
+                    <v>48454</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>45769</v>
+                    <v>45781</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19852,7 +18650,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>48442</v>
+                                    <v>48454</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19868,7 +18666,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45051</v>
+                                    <v>45062</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19883,11 +18681,11 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>5902896</cardinality>
+            <cardinality>5902899</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5902896</v>
+                    <v>5902899</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -19895,7 +18693,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5846581</v>
+                    <v>5846584</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -19913,7 +18711,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5902896</v>
+                                    <v>5902899</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19929,7 +18727,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5902896</v>
+                                    <v>5902899</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19945,7 +18743,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5902896</v>
+                                    <v>5902899</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19961,7 +18759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>136593</v>
+                                    <v>136594</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20012,7 +18810,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>136593</v>
+                                    <v>136594</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20079,7 +18877,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5800886</v>
+                                    <v>5800889</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20100,7 +18898,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5800886</v>
+                                    <v>5800889</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20121,7 +18919,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5846581</v>
+                                    <v>5846584</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20179,26 +18977,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1332543</cardinality>
+            <cardinality>1332544</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1332543</v>
+                    <v>1332544</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>973628</cardinality>
+            <cardinality>973581</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>973628</v>
+                    <v>973581</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>182644</v>
+                    <v>182636</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20212,7 +19010,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>973628</v>
+                                    <v>973581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20228,17 +19026,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>110588</v>
+                                    <v>110583</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42790</v>
+                                    <v>42788</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>14377</v>
+                                    <v>14376</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -20258,11 +19056,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2484800</cardinality>
+            <cardinality>2484681</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1453288</v>
+                    <v>1453218</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20270,7 +19068,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>298003</v>
+                    <v>297988</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20284,22 +19082,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>783011</v>
+                                    <v>782974</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>413156</v>
+                                    <v>413136</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>171810</v>
+                                    <v>171802</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>85309</v>
+                                    <v>85305</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20315,22 +19113,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>802158</v>
+                                    <v>802120</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>411248</v>
+                                    <v>411229</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>169630</v>
+                                    <v>169622</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>70250</v>
+                                    <v>70247</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20468,32 +19266,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>174774</v>
+                                    <v>174766</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26335</v>
+                                    <v>26334</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>19998</v>
+                                    <v>19997</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>22655</v>
+                                    <v>22654</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>23235</v>
+                                    <v>23234</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>76</b>
-                                    <v>23371</v>
+                                    <v>23370</v>
                                 </b>
                                 <b>
                                     <a>79</a>
@@ -20514,17 +19312,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>256813</v>
+                                    <v>256801</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>32127</v>
+                                    <v>32125</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>9062</v>
+                                    <v>9061</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20534,11 +19332,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>452779</cardinality>
+            <cardinality>452757</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>196783</v>
+                    <v>196774</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20546,7 +19344,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>450087</v>
+                    <v>450066</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20560,17 +19358,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>151403</v>
+                                    <v>151396</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42893</v>
+                                    <v>42891</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>2487</v>
+                                    <v>2486</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20586,17 +19384,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>144487</v>
+                                    <v>144480</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36692</v>
+                                    <v>36690</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>54</b>
-                                    <v>14854</v>
+                                    <v>14853</v>
                                 </b>
                                 <b>
                                     <a>54</a>
@@ -20739,7 +19537,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>447396</v>
+                                    <v>447374</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20760,7 +19558,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>450087</v>
+                                    <v>450066</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21334,11 +20132,11 @@
         </relation>
         <relation>
             <name>template_template_argument</name>
-            <cardinality>9675</cardinality>
+            <cardinality>9678</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>6116</v>
+                    <v>6117</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -21346,7 +20144,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>9084</v>
+                    <v>9086</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21360,7 +20158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5017</v>
+                                    <v>5018</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21391,7 +20189,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5038</v>
+                                    <v>5039</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21544,7 +20342,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9052</v>
+                                    <v>9054</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21565,7 +20363,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9063</v>
+                                    <v>9065</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21716,19 +20514,19 @@
         </relation>
         <relation>
             <name>concept_templates</name>
-            <cardinality>3614</cardinality>
+            <cardinality>3611</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>3614</v>
+                    <v>3611</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>3614</v>
+                    <v>3611</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3614</v>
+                    <v>3611</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21742,7 +20540,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3614</v>
+                                    <v>3611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21758,7 +20556,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3614</v>
+                                    <v>3611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21774,7 +20572,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3614</v>
+                                    <v>3611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21790,7 +20588,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3614</v>
+                                    <v>3611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21806,7 +20604,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3614</v>
+                                    <v>3611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21822,7 +20620,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3614</v>
+                                    <v>3611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21832,15 +20630,15 @@
         </relation>
         <relation>
             <name>concept_instantiation</name>
-            <cardinality>90437</cardinality>
+            <cardinality>90344</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>90437</v>
+                    <v>90344</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>3442</v>
+                    <v>3439</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21854,7 +20652,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>90437</v>
+                                    <v>90344</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21885,12 +20683,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>129</v>
+                                    <v>128</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>301</v>
+                                    <v>300</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -21910,37 +20708,37 @@
                                 <b>
                                     <a>12</a>
                                     <b>15</b>
-                                    <v>215</v>
+                                    <v>214</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>19</b>
-                                    <v>215</v>
+                                    <v>214</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>25</b>
-                                    <v>258</v>
+                                    <v>257</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>37</b>
-                                    <v>258</v>
+                                    <v>257</v>
                                 </b>
                                 <b>
                                     <a>38</a>
                                     <b>49</b>
-                                    <v>258</v>
+                                    <v>257</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>72</b>
-                                    <v>258</v>
+                                    <v>257</v>
                                 </b>
                                 <b>
                                     <a>78</a>
                                     <b>387</b>
-                                    <v>215</v>
+                                    <v>214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21950,30 +20748,30 @@
         </relation>
         <relation>
             <name>is_type_constraint</name>
-            <cardinality>36902</cardinality>
+            <cardinality>36864</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>36902</v>
+                    <v>36864</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>concept_template_argument</name>
-            <cardinality>113051</cardinality>
+            <cardinality>112936</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>76386</v>
+                    <v>76308</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>129</v>
+                    <v>128</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>21431</v>
+                    <v>21409</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21987,17 +20785,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46477</v>
+                                    <v>46429</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24680</v>
+                                    <v>24655</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>5228</v>
+                                    <v>5223</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22013,17 +20811,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50092</v>
+                                    <v>50041</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22377</v>
+                                    <v>22355</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>3916</v>
+                                    <v>3912</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22121,42 +20919,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10392</v>
+                                    <v>10382</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2969</v>
+                                    <v>2966</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1054</v>
+                                    <v>1053</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1355</v>
+                                    <v>1354</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1161</v>
+                                    <v>1160</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>1613</v>
+                                    <v>1612</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>14</b>
-                                    <v>1979</v>
+                                    <v>1977</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>259</b>
-                                    <v>903</v>
+                                    <v>902</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22172,17 +20970,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18031</v>
+                                    <v>18013</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3270</v>
+                                    <v>3267</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>129</v>
+                                    <v>128</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22323,15 +21121,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>604318</cardinality>
+            <cardinality>604289</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>604318</v>
+                    <v>604289</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>283864</v>
+                    <v>283850</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22345,7 +21143,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>604318</v>
+                                    <v>604289</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22361,17 +21159,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>234225</v>
+                                    <v>234214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>35091</v>
+                                    <v>35089</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4676</b>
-                                    <v>14547</v>
+                                    <v>14546</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22381,7 +21179,7 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>1176788</cardinality>
+            <cardinality>1176789</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
@@ -22747,19 +21545,19 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>9728</cardinality>
+            <cardinality>9730</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9728</v>
+                    <v>9730</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>7975</v>
+                    <v>7977</v>
                 </e>
                 <e>
                     <k>class_id</k>
-                    <v>4869</v>
+                    <v>4870</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22773,7 +21571,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9728</v>
+                                    <v>9730</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22789,7 +21587,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9728</v>
+                                    <v>9730</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22805,7 +21603,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7753</v>
+                                    <v>7755</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22826,7 +21624,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7753</v>
+                                    <v>7755</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22847,7 +21645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3897</v>
+                                    <v>3898</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22878,7 +21676,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3897</v>
+                                    <v>3898</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22951,11 +21749,11 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>854940</cardinality>
+            <cardinality>854941</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>847448</v>
+                    <v>847449</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -23064,11 +21862,11 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>9723248</cardinality>
+            <cardinality>9723254</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>4012489</v>
+                    <v>4012492</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -23086,7 +21884,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1528454</v>
+                                    <v>1528455</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23096,7 +21894,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1037865</v>
+                                    <v>1037866</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -23222,11 +22020,11 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>3078135</cardinality>
+            <cardinality>3078137</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>2316967</v>
+                    <v>2316969</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -23244,7 +22042,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1659561</v>
+                                    <v>1659562</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23368,11 +22166,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>654409</cardinality>
+            <cardinality>654410</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>654409</v>
+                    <v>654410</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -23402,7 +22200,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654409</v>
+                                    <v>654410</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23418,7 +22216,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654409</v>
+                                    <v>654410</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23434,7 +22232,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654409</v>
+                                    <v>654410</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23450,7 +22248,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654409</v>
+                                    <v>654410</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23853,7 +22651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>642422</v>
+                                    <v>642423</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24620,15 +23418,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>71909</cardinality>
+            <cardinality>71994</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>71909</v>
+                    <v>71994</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>71909</v>
+                    <v>71994</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24642,7 +23440,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71909</v>
+                                    <v>71994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24658,7 +23456,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71909</v>
+                                    <v>71994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24668,15 +23466,15 @@
         </relation>
         <relation>
             <name>attribute_arg_expr</name>
-            <cardinality>1404</cardinality>
+            <cardinality>1405</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>1404</v>
+                    <v>1405</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>1404</v>
+                    <v>1405</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24690,7 +23488,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1404</v>
+                                    <v>1405</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24706,7 +23504,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1404</v>
+                                    <v>1405</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24836,7 +23634,7 @@
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>799750</v>
+                    <v>799751</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -24854,7 +23652,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>759669</v>
+                                    <v>759670</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24890,7 +23688,7 @@
         </relation>
         <relation>
             <name>varattributes</name>
-            <cardinality>537096</cardinality>
+            <cardinality>537095</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
@@ -24953,7 +23751,7 @@
         </relation>
         <relation>
             <name>namespaceattributes</name>
-            <cardinality>5996</cardinality>
+            <cardinality>5995</cardinality>
             <columnsizes>
                 <e>
                     <k>namespace_id</k>
@@ -24961,7 +23759,7 @@
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>5996</v>
+                    <v>5995</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25001,7 +23799,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5996</v>
+                                    <v>5995</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25011,15 +23809,15 @@
         </relation>
         <relation>
             <name>stmtattributes</name>
-            <cardinality>2216</cardinality>
+            <cardinality>2214</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt_id</k>
-                    <v>2216</v>
+                    <v>2214</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>559</v>
+                    <v>558</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25033,7 +23831,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2216</v>
+                                    <v>2214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25049,7 +23847,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>215</v>
+                                    <v>214</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25059,7 +23857,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -25069,7 +23867,7 @@
                                 <b>
                                     <a>13</a>
                                     <b>16</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25079,15 +23877,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>7179403</cardinality>
+            <cardinality>7179407</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>7179403</v>
+                    <v>7179407</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>3965915</v>
+                    <v>3965917</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25101,7 +23899,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7179403</v>
+                                    <v>7179407</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25117,17 +23915,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2482786</v>
+                                    <v>2482788</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1117778</v>
+                                    <v>1117779</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>302918</v>
+                                    <v>302919</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -25142,11 +23940,11 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4193417</cardinality>
+            <cardinality>4193419</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>543780</v>
+                    <v>543781</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25154,7 +23952,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4188797</v>
+                    <v>4188799</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25432,7 +24230,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4188797</v>
+                                    <v>4188799</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25448,7 +24246,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4184177</v>
+                                    <v>4184179</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25463,15 +24261,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>114813</cardinality>
+            <cardinality>114807</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>114813</v>
+                    <v>114807</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>71340</v>
+                    <v>71337</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25485,7 +24283,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>114813</v>
+                                    <v>114807</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25501,7 +24299,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49332</v>
+                                    <v>49329</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25511,12 +24309,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>15365</v>
+                                    <v>15364</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>37</b>
-                                    <v>2010</v>
+                                    <v>2009</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25526,15 +24324,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>476900</cardinality>
+            <cardinality>476877</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>476900</v>
+                    <v>476877</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>455164</v>
+                    <v>455142</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25542,11 +24340,11 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>235554</v>
+                    <v>235542</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>35397</v>
+                    <v>35396</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25560,7 +24358,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476900</v>
+                                    <v>476877</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25576,7 +24374,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476900</v>
+                                    <v>476877</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25592,7 +24390,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476900</v>
+                                    <v>476877</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25608,7 +24406,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476900</v>
+                                    <v>476877</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25624,12 +24422,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438640</v>
+                                    <v>438619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>16523</v>
+                                    <v>16522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25645,12 +24443,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438640</v>
+                                    <v>438619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>16523</v>
+                                    <v>16522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25666,12 +24464,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438640</v>
+                                    <v>438619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>16523</v>
+                                    <v>16522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25687,12 +24485,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438640</v>
+                                    <v>438619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>16523</v>
+                                    <v>16522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25847,7 +24645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>225742</v>
+                                    <v>225731</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25868,7 +24666,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>225742</v>
+                                    <v>225731</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25889,7 +24687,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>235111</v>
+                                    <v>235100</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25910,7 +24708,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230205</v>
+                                    <v>230194</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25931,7 +24729,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26505</v>
+                                    <v>26504</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25967,7 +24765,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26505</v>
+                                    <v>26504</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26003,7 +24801,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35397</v>
+                                    <v>35396</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26019,7 +24817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28720</v>
+                                    <v>28718</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26044,11 +24842,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>478671</cardinality>
+            <cardinality>478648</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>476457</v>
+                    <v>476434</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -26066,7 +24864,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>474242</v>
+                                    <v>474220</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26112,11 +24910,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>449985</cardinality>
+            <cardinality>449963</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>449985</v>
+                    <v>449963</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -26134,7 +24932,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>449985</v>
+                                    <v>449963</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26331,19 +25129,19 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>700455</cardinality>
+            <cardinality>700420</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>700455</v>
+                    <v>700420</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>42415</v>
+                    <v>42413</v>
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>77745</v>
+                    <v>77741</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -26361,7 +25159,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>700455</v>
+                                    <v>700420</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26377,7 +25175,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>700455</v>
+                                    <v>700420</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26393,7 +25191,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>700455</v>
+                                    <v>700420</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26414,7 +25212,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13968</v>
+                                    <v>13967</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26470,7 +25268,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13968</v>
+                                    <v>13967</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26521,7 +25319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41052</v>
+                                    <v>41050</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26542,27 +25340,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47866</v>
+                                    <v>47864</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6064</v>
+                                    <v>6063</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>5996</v>
+                                    <v>5995</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>6064</v>
+                                    <v>6063</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>40</b>
-                                    <v>6064</v>
+                                    <v>6063</v>
                                 </b>
                                 <b>
                                     <a>40</a>
@@ -26583,27 +25381,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47866</v>
+                                    <v>47864</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6064</v>
+                                    <v>6063</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>5996</v>
+                                    <v>5995</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>6064</v>
+                                    <v>6063</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>40</b>
-                                    <v>6064</v>
+                                    <v>6063</v>
                                 </b>
                                 <b>
                                     <a>40</a>
@@ -26624,7 +25422,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77063</v>
+                                    <v>77059</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26666,7 +25464,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5962</v>
+                                    <v>5961</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26702,19 +25500,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>11241963</cardinality>
+            <cardinality>11241970</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11241963</v>
+                    <v>11241970</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>4306668</v>
+                    <v>4306670</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11241963</v>
+                    <v>11241970</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26728,7 +25526,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11241963</v>
+                                    <v>11241970</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26744,7 +25542,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11241963</v>
+                                    <v>11241970</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26760,7 +25558,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3932327</v>
+                                    <v>3932329</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26786,7 +25584,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3932327</v>
+                                    <v>3932329</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26812,7 +25610,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11241963</v>
+                                    <v>11241970</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26828,7 +25626,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11241963</v>
+                                    <v>11241970</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26838,15 +25636,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3916719</cardinality>
+            <cardinality>3916721</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3352211</v>
+                    <v>3352213</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3751025</v>
+                    <v>3751027</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26860,7 +25658,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3290528</v>
+                                    <v>3290530</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26881,12 +25679,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3585331</v>
+                                    <v>3585333</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>165693</v>
+                                    <v>165694</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26896,15 +25694,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>9633088</cardinality>
+            <cardinality>9633092</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9632982</v>
+                    <v>9632986</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>9633088</v>
+                    <v>9633092</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26918,7 +25716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9632877</v>
+                                    <v>9632881</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26939,7 +25737,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9633088</v>
+                                    <v>9633092</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26949,30 +25747,30 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>9892119</cardinality>
+            <cardinality>9891533</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9892119</v>
+                    <v>9891533</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1671762</cardinality>
+            <cardinality>1670057</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>1245010</v>
+                    <v>1243740</v>
                 </e>
                 <e>
                     <k>i</k>
-                    <v>387</v>
+                    <v>386</v>
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1671762</v>
+                    <v>1670057</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26986,17 +25784,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>828715</v>
+                                    <v>827870</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>409495</v>
+                                    <v>409077</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>6799</v>
+                                    <v>6792</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27012,17 +25810,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>828715</v>
+                                    <v>827870</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>409495</v>
+                                    <v>409077</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>6799</v>
+                                    <v>6792</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27038,17 +25836,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>86</v>
+                                    <v>85</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>86</v>
+                                    <v>85</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -27104,17 +25902,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>86</v>
+                                    <v>85</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>86</v>
+                                    <v>85</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -27170,7 +25968,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1671762</v>
+                                    <v>1670057</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27186,7 +25984,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1671762</v>
+                                    <v>1670057</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27196,15 +25994,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>8651</cardinality>
+            <cardinality>8653</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8651</v>
+                    <v>8653</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>4573</v>
+                    <v>4574</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27218,7 +26016,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8651</v>
+                                    <v>8653</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27234,7 +26032,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3739</v>
+                                    <v>3740</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27265,7 +26063,7 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2039521</cardinality>
+            <cardinality>2039522</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
@@ -27273,7 +26071,7 @@
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2039521</v>
+                    <v>2039522</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27363,7 +26161,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2039521</v>
+                                    <v>2039522</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27373,11 +26171,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19454215</cardinality>
+            <cardinality>19454225</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19454215</v>
+                    <v>19454225</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -27385,7 +26183,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12939986</v>
+                    <v>12939994</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27399,7 +26197,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19454215</v>
+                                    <v>19454225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27415,7 +26213,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19454215</v>
+                                    <v>19454225</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27533,12 +26331,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7394756</v>
+                                    <v>7394760</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5082679</v>
+                                    <v>5082682</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27559,12 +26357,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7394756</v>
+                                    <v>7394760</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5082679</v>
+                                    <v>5082682</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27579,22 +26377,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6909474</cardinality>
+            <cardinality>6909477</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6909474</v>
+                    <v>6909477</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>6050445</cardinality>
+            <cardinality>6050435</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6050445</v>
+                    <v>6050435</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27612,7 +26410,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6050445</v>
+                                    <v>6050435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27656,8 +26454,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5831535</a>
-                                    <b>5831536</b>
+                                    <a>5831536</a>
+                                    <b>5831537</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -27668,11 +26466,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>5803012</cardinality>
+            <cardinality>5797114</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>5803012</v>
+                    <v>5797114</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27690,7 +26488,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5803012</v>
+                                    <v>5797114</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27714,8 +26512,8 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>268053</a>
-                                    <b>268054</b>
+                                    <a>268054</a>
+                                    <b>268055</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -27726,11 +26524,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>627938</cardinality>
+            <cardinality>627939</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>627938</v>
+                    <v>627939</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -27748,7 +26546,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>627938</v>
+                                    <v>627939</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27832,23 +26630,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>3042067</cardinality>
+            <cardinality>3038986</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3042067</v>
+                    <v>3038986</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>3042067</v>
+                    <v>3038986</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>47488</v>
+                    <v>47440</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>552477</v>
+                    <v>551913</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27862,7 +26660,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042067</v>
+                                    <v>3038986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27878,7 +26676,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042067</v>
+                                    <v>3038986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27894,7 +26692,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042067</v>
+                                    <v>3038986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27910,7 +26708,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042067</v>
+                                    <v>3038986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27926,7 +26724,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042067</v>
+                                    <v>3038986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27942,7 +26740,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042067</v>
+                                    <v>3038986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27958,27 +26756,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31544</v>
+                                    <v>31512</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8176</v>
+                                    <v>8168</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4109</v>
+                                    <v>4105</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>6810</b>
-                                    <v>3571</v>
+                                    <b>6811</b>
+                                    <v>3568</v>
                                 </b>
                                 <b>
                                     <a>19018</a>
                                     <b>41956</b>
-                                    <v>86</v>
+                                    <v>85</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27994,27 +26792,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31544</v>
+                                    <v>31512</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8176</v>
+                                    <v>8168</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4109</v>
+                                    <v>4105</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>6810</b>
-                                    <v>3571</v>
+                                    <b>6811</b>
+                                    <v>3568</v>
                                 </b>
                                 <b>
                                     <a>19018</a>
                                     <b>41956</b>
-                                    <v>86</v>
+                                    <v>85</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28030,22 +26828,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34406</v>
+                                    <v>34371</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7358</v>
+                                    <v>7351</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>3571</v>
+                                    <v>3568</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>20057</b>
-                                    <v>2151</v>
+                                    <v>2149</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28061,22 +26859,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79162</v>
+                                    <v>79059</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>38085</v>
+                                    <v>38068</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>399016</v>
+                                    <v>398609</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36213</v>
+                                    <v>36176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28092,22 +26890,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79162</v>
+                                    <v>79059</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>38085</v>
+                                    <v>38068</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>399016</v>
+                                    <v>398609</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36213</v>
+                                    <v>36176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28123,22 +26921,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>111545</v>
+                                    <v>111431</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>13297</v>
+                                    <v>13284</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>415326</v>
+                                    <v>414902</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>33</b>
-                                    <v>12307</v>
+                                    <v>12295</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28148,11 +26946,11 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>8254631</cardinality>
+            <cardinality>8254635</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>8254631</v>
+                    <v>8254635</v>
                 </e>
                 <e>
                     <k>var</k>
@@ -28170,7 +26968,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8254631</v>
+                                    <v>8254635</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28186,7 +26984,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171535</v>
+                                    <v>171536</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28196,7 +26994,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>145647</v>
+                                    <v>145648</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -28241,15 +27039,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>5812630</cardinality>
+            <cardinality>5806808</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>5810263</v>
+                    <v>5804336</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>275937</v>
+                    <v>275677</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28263,12 +27061,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5807896</v>
+                                    <v>5801865</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2366</v>
+                                    <v>2471</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28284,27 +27082,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>181433</v>
+                                    <v>181269</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>38838</v>
+                                    <v>38799</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17213</v>
+                                    <v>17174</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>22722</v>
+                                    <v>22720</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>37798</b>
-                                    <v>15729</v>
+                                    <v>15713</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28314,11 +27112,11 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>45243</cardinality>
+            <cardinality>45241</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>45243</v>
+                    <v>45241</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -28340,7 +27138,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45243</v>
+                                    <v>45241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28356,7 +27154,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45243</v>
+                                    <v>45241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28440,11 +27238,11 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>53829</cardinality>
+            <cardinality>53826</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>53829</v>
+                    <v>53826</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -28466,7 +27264,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53829</v>
+                                    <v>53826</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28482,7 +27280,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53829</v>
+                                    <v>53826</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28731,11 +27529,11 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>13474604</cardinality>
+            <cardinality>13474612</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13474604</v>
+                    <v>13474612</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -28753,7 +27551,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13474604</v>
+                                    <v>13474612</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28862,15 +27660,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>13583186</cardinality>
+            <cardinality>13583194</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>13474604</v>
+                    <v>13474612</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>13583186</v>
+                    <v>13583194</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28884,7 +27682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13384049</v>
+                                    <v>13384057</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28905,7 +27703,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13583186</v>
+                                    <v>13583194</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28915,11 +27713,11 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1496814</cardinality>
+            <cardinality>1496815</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1496814</v>
+                    <v>1496815</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
@@ -28941,7 +27739,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1496814</v>
+                                    <v>1496815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28957,7 +27755,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1496814</v>
+                                    <v>1496815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29302,19 +28100,19 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>2251034</cardinality>
+            <cardinality>2251036</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>2251034</v>
+                    <v>2251036</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>980971</v>
+                    <v>980972</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>2251034</v>
+                    <v>2251036</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -29332,7 +28130,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251034</v>
+                                    <v>2251036</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29348,7 +28146,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251034</v>
+                                    <v>2251036</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29364,7 +28162,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251034</v>
+                                    <v>2251036</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29380,7 +28178,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>870556</v>
+                                    <v>870557</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29406,7 +28204,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>870556</v>
+                                    <v>870557</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29432,7 +28230,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>980963</v>
+                                    <v>980964</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29453,7 +28251,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251034</v>
+                                    <v>2251036</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29469,7 +28267,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251034</v>
+                                    <v>2251036</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29485,7 +28283,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2251034</v>
+                                    <v>2251036</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29506,7 +28304,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33606</v>
+                                    <v>33607</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -29532,7 +28330,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>443657</v>
+                                    <v>443658</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29563,7 +28361,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33606</v>
+                                    <v>33607</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -29583,26 +28381,26 @@
         </relation>
         <relation>
             <name>braced_initialisers</name>
-            <cardinality>68441</cardinality>
+            <cardinality>68468</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>68441</v>
+                    <v>68468</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>1677744</cardinality>
+            <cardinality>1676032</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>1677744</v>
+                    <v>1676032</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>839689</v>
+                    <v>838833</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29616,7 +28414,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1677744</v>
+                                    <v>1676032</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29632,17 +28430,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17084</v>
+                                    <v>17067</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>812534</v>
+                                    <v>811706</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>10070</v>
+                                    <v>10059</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29652,11 +28450,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25210573</cardinality>
+            <cardinality>25210587</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25210573</v>
+                    <v>25210587</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -29664,7 +28462,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>10582669</v>
+                    <v>10582675</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29678,7 +28476,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210573</v>
+                                    <v>25210587</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29694,7 +28492,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210573</v>
+                                    <v>25210587</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29872,12 +28670,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8900700</v>
+                                    <v>8900705</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>820608</v>
+                                    <v>820609</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -29903,7 +28701,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9040102</v>
+                                    <v>9040107</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29923,19 +28721,19 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>847070</cardinality>
+            <cardinality>846206</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>847070</v>
+                    <v>846206</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>847070</v>
+                    <v>846206</v>
                 </e>
                 <e>
                     <k>value_category</k>
-                    <v>43</v>
+                    <v>42</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29949,7 +28747,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>847070</v>
+                                    <v>846206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29965,7 +28763,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>847070</v>
+                                    <v>846206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29981,7 +28779,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>847070</v>
+                                    <v>846206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29997,7 +28795,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>847070</v>
+                                    <v>846206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30049,11 +28847,11 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25210573</cardinality>
+            <cardinality>25210587</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25210573</v>
+                    <v>25210587</v>
                 </e>
                 <e>
                     <k>typeid</k>
@@ -30075,7 +28873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210573</v>
+                                    <v>25210587</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30091,7 +28889,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210573</v>
+                                    <v>25210587</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30236,15 +29034,15 @@
         </relation>
         <relation>
             <name>new_allocated_type</name>
-            <cardinality>46197</cardinality>
+            <cardinality>46195</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>46197</v>
+                    <v>46195</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>27391</v>
+                    <v>27390</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30258,7 +29056,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46197</v>
+                                    <v>46195</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30274,12 +29072,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11515</v>
+                                    <v>11514</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14479</v>
+                                    <v>14478</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30357,15 +29155,15 @@
         </relation>
         <relation>
             <name>aggregate_field_init</name>
-            <cardinality>5717390</cardinality>
+            <cardinality>5717382</cardinality>
             <columnsizes>
                 <e>
                     <k>aggregate</k>
-                    <v>1243070</v>
+                    <v>1243068</v>
                 </e>
                 <e>
                     <k>initializer</k>
-                    <v>5717212</v>
+                    <v>5717204</v>
                 </e>
                 <e>
                     <k>field</k>
@@ -30396,7 +29194,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>669034</v>
+                                    <v>669033</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30447,7 +29245,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>668966</v>
+                                    <v>668965</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30498,7 +29296,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>669034</v>
+                                    <v>669033</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30544,7 +29342,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1242988</v>
+                                    <v>1242986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30565,7 +29363,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5717212</v>
+                                    <v>5717204</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30581,7 +29379,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5717034</v>
+                                    <v>5717026</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30602,7 +29400,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5717212</v>
+                                    <v>5717204</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30618,7 +29416,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5717212</v>
+                                    <v>5717204</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31100,7 +29898,7 @@
         </relation>
         <relation>
             <name>aggregate_array_init</name>
-            <cardinality>1349248</cardinality>
+            <cardinality>1349246</cardinality>
             <columnsizes>
                 <e>
                     <k>aggregate</k>
@@ -31108,7 +29906,7 @@
                 </e>
                 <e>
                     <k>initializer</k>
-                    <v>1349248</v>
+                    <v>1349246</v>
                 </e>
                 <e>
                     <k>element_index</k>
@@ -31303,7 +30101,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1349248</v>
+                                    <v>1349246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31319,7 +30117,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1349248</v>
+                                    <v>1349246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31335,7 +30133,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1349248</v>
+                                    <v>1349246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31351,7 +30149,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1349248</v>
+                                    <v>1349246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31693,15 +30491,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>408935</cardinality>
+            <cardinality>408518</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>408935</v>
+                    <v>408518</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>408935</v>
+                    <v>408518</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31715,7 +30513,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408935</v>
+                                    <v>408518</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31731,7 +30529,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408935</v>
+                                    <v>408518</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31741,15 +30539,15 @@
         </relation>
         <relation>
             <name>typeid_bind</name>
-            <cardinality>47901</cardinality>
+            <cardinality>47898</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>47901</v>
+                    <v>47898</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>15944</v>
+                    <v>15943</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31763,7 +30561,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47901</v>
+                                    <v>47898</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31779,12 +30577,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2964</v>
+                                    <v>2963</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12571</v>
+                                    <v>12570</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -33447,15 +32245,15 @@
         </relation>
         <relation>
             <name>fold</name>
-            <cardinality>1248</cardinality>
+            <cardinality>1246</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>1248</v>
+                    <v>1246</v>
                 </e>
                 <e>
                     <k>operator</k>
-                    <v>86</v>
+                    <v>85</v>
                 </e>
                 <e>
                     <k>is_left_fold</k>
@@ -33473,7 +32271,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1248</v>
+                                    <v>1246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33489,7 +32287,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1248</v>
+                                    <v>1246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33505,7 +32303,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43</v>
+                                    <v>42</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33531,7 +32329,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>86</v>
+                                    <v>85</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33573,11 +32371,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>6368967</cardinality>
+            <cardinality>6368971</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6368967</v>
+                    <v>6368971</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -33585,7 +32383,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2684538</v>
+                    <v>2684539</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33599,7 +32397,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6368967</v>
+                                    <v>6368971</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33615,7 +32413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6368967</v>
+                                    <v>6368971</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33853,7 +32651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2225039</v>
+                                    <v>2225040</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33884,7 +32682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2601580</v>
+                                    <v>2601582</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34054,15 +32852,15 @@
         </relation>
         <relation>
             <name>if_then</name>
-            <cardinality>990214</cardinality>
+            <cardinality>990215</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>990214</v>
+                    <v>990215</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>990214</v>
+                    <v>990215</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34076,7 +32874,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>990214</v>
+                                    <v>990215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34092,7 +32890,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>990214</v>
+                                    <v>990215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34102,15 +32900,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>437123</cardinality>
+            <cardinality>436677</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>437123</v>
+                    <v>436677</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>437123</v>
+                    <v>436677</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34124,7 +32922,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>437123</v>
+                                    <v>436677</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34140,7 +32938,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>437123</v>
+                                    <v>436677</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34390,15 +33188,15 @@
         </relation>
         <relation>
             <name>while_body</name>
-            <cardinality>39647</cardinality>
+            <cardinality>39648</cardinality>
             <columnsizes>
                 <e>
                     <k>while_stmt</k>
-                    <v>39647</v>
+                    <v>39648</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>39647</v>
+                    <v>39648</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34412,7 +33210,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39647</v>
+                                    <v>39648</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34428,7 +33226,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39647</v>
+                                    <v>39648</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34534,19 +33332,19 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>836182</cardinality>
+            <cardinality>835329</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>411883</v>
+                    <v>411463</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>387</v>
+                    <v>386</v>
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>836182</v>
+                    <v>835329</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34565,12 +33363,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>409000</v>
+                                    <v>408582</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>2861</v>
+                                    <v>2858</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34591,12 +33389,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>409000</v>
+                                    <v>408582</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>2861</v>
+                                    <v>2858</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34754,7 +33552,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>836182</v>
+                                    <v>835329</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34770,7 +33568,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>836182</v>
+                                    <v>835329</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34780,15 +33578,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>411883</cardinality>
+            <cardinality>411463</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>411883</v>
+                    <v>411463</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>411883</v>
+                    <v>411463</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34802,7 +33600,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>411883</v>
+                                    <v>411463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34818,7 +33616,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>411883</v>
+                                    <v>411463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35020,11 +33818,11 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>5628379</cardinality>
+            <cardinality>5628382</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5628379</v>
+                    <v>5628382</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -35032,7 +33830,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2381490</v>
+                    <v>2381491</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35046,7 +33844,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5628379</v>
+                                    <v>5628382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35062,7 +33860,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5628379</v>
+                                    <v>5628382</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35200,7 +33998,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359015</v>
+                                    <v>1359016</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35241,7 +34039,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359015</v>
+                                    <v>1359016</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35276,11 +34074,11 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>43790</cardinality>
+            <cardinality>43746</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>43790</v>
+                    <v>43746</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -35313,7 +34111,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707850</v>
+                                    <v>707851</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35334,7 +34132,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707850</v>
+                                    <v>707851</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35519,7 +34317,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707850</v>
+                                    <v>707851</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35540,7 +34338,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>707850</v>
+                                    <v>707851</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35699,15 +34497,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1644952</cardinality>
+            <cardinality>1644953</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1644952</v>
+                    <v>1644953</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1428064</v>
+                    <v>1428065</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35721,7 +34519,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1644952</v>
+                                    <v>1644953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35757,11 +34555,11 @@
         </relation>
         <relation>
             <name>jumpinfo</name>
-            <cardinality>348320</cardinality>
+            <cardinality>348321</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>348320</v>
+                    <v>348321</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -35783,7 +34581,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348320</v>
+                                    <v>348321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35799,7 +34597,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348320</v>
+                                    <v>348321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35892,7 +34690,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36210</v>
+                                    <v>36211</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -35938,11 +34736,11 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5413333</cardinality>
+            <cardinality>5413336</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5413333</v>
+                    <v>5413336</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -35950,7 +34748,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5410087</v>
+                    <v>5410090</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35964,7 +34762,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5413333</v>
+                                    <v>5413336</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35980,7 +34778,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5413333</v>
+                                    <v>5413336</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36128,7 +34926,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5409962</v>
+                                    <v>5409965</v>
                                 </b>
                                 <b>
                                     <a>27</a>
@@ -36149,7 +34947,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5410087</v>
+                                    <v>5410090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36159,15 +34957,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1142251</cardinality>
+            <cardinality>1142252</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>889777</v>
+                    <v>889778</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1142251</v>
+                    <v>1142252</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36186,7 +34984,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>230622</v>
+                                    <v>230623</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -36207,7 +35005,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1142251</v>
+                                    <v>1142252</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36228,30 +35026,30 @@
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>285562</cardinality>
+            <cardinality>285563</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>285562</v>
+                    <v>285563</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>4356364</cardinality>
+            <cardinality>4356366</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4356364</v>
+                    <v>4356366</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2957767</v>
+                    <v>2957769</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1684908</v>
+                    <v>1684909</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36265,7 +35063,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4356364</v>
+                                    <v>4356366</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36281,7 +35079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4356364</v>
+                                    <v>4356366</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36297,7 +35095,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2758984</v>
+                                    <v>2758986</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36318,7 +35116,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2876481</v>
+                                    <v>2876482</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36339,7 +35137,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1536570</v>
+                                    <v>1536571</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36385,15 +35183,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>318656</cardinality>
+            <cardinality>318734</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>318656</v>
+                    <v>318734</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>58699</v>
+                    <v>58713</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36407,7 +35205,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318656</v>
+                                    <v>318734</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36423,37 +35221,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29048</v>
+                                    <v>29055</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9443</v>
+                                    <v>9445</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4954</v>
+                                    <v>4955</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>5355</v>
+                                    <v>5356</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>4520</v>
+                                    <v>4522</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>47</b>
-                                    <v>4404</v>
+                                    <v>4405</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>793</b>
-                                    <v>971</v>
+                                    <v>972</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36511,11 +35309,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>30398081</cardinality>
+            <cardinality>30396619</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3866101</v>
+                    <v>3865915</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -36533,17 +35331,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>530456</v>
+                                    <v>530431</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>26948</v>
+                                    <v>26947</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3308695</v>
+                                    <v>3308536</v>
                                 </b>
                             </bs>
                         </hist>