diff --git a/actions/ql/lib/CHANGELOG.md b/actions/ql/lib/CHANGELOG.md
index 011af903a2a..ddd0b0f1aec 100644
--- a/actions/ql/lib/CHANGELOG.md
+++ b/actions/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 0.4.36
+
+### Minor Analysis Improvements
+
+* Altered 2 patterns in the `poisonable_steps` modelling. Extra sinks are detected in the following cases: scripts executed via python modules and `go run` in directories are detected as potential mechanisms of injection. For the go execution pattern, the pattern is updated to now ignore flags that occur between go and the specific command. This change may lead to more results being detected by the following queries: `actions/untrusted-checkout/high`, `actions/untrusted-checkout/critical`, `actions/untrusted-checkout-toctou/high`, `actions/untrusted-checkout-toctou/critical`, `actions/cache-poisoning/poisonable-step`, `actions/cache-poisoning/direct-cache` and `actions/artifact-poisoning/path-traversal`.
+
 ## 0.4.35
 
 No user-facing changes.
diff --git a/actions/ql/lib/change-notes/2026-04-15-poisonable-steps-additions-alterations.md b/actions/ql/lib/change-notes/released/0.4.36.md
similarity index 92%
rename from actions/ql/lib/change-notes/2026-04-15-poisonable-steps-additions-alterations.md
rename to actions/ql/lib/change-notes/released/0.4.36.md
index 4a28280a3c8..1781776f932 100644
--- a/actions/ql/lib/change-notes/2026-04-15-poisonable-steps-additions-alterations.md
+++ b/actions/ql/lib/change-notes/released/0.4.36.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
-* Altered 2 patterns in the `poisonable_steps` modelling. Extra sinks are detected in the following cases: scripts executed via python modules and `go run` in directories are detected as potential mechanisms of injection. For the go execution pattern, the pattern is updated to now ignore flags that occur between go and the specific command. This change may lead to more results being detected by the following queries: `actions/untrusted-checkout/high`, `actions/untrusted-checkout/critical`, `actions/untrusted-checkout-toctou/high`, `actions/untrusted-checkout-toctou/critical`, `actions/cache-poisoning/poisonable-step`, `actions/cache-poisoning/direct-cache` and `actions/artifact-poisoning/path-traversal`.
\ No newline at end of file
+## 0.4.36
+
+### Minor Analysis Improvements
+
+* Altered 2 patterns in the `poisonable_steps` modelling. Extra sinks are detected in the following cases: scripts executed via python modules and `go run` in directories are detected as potential mechanisms of injection. For the go execution pattern, the pattern is updated to now ignore flags that occur between go and the specific command. This change may lead to more results being detected by the following queries: `actions/untrusted-checkout/high`, `actions/untrusted-checkout/critical`, `actions/untrusted-checkout-toctou/high`, `actions/untrusted-checkout-toctou/critical`, `actions/cache-poisoning/poisonable-step`, `actions/cache-poisoning/direct-cache` and `actions/artifact-poisoning/path-traversal`.
diff --git a/actions/ql/lib/codeql-pack.release.yml b/actions/ql/lib/codeql-pack.release.yml
index 524302c92d3..45433e3ec03 100644
--- a/actions/ql/lib/codeql-pack.release.yml
+++ b/actions/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.4.35
+lastReleaseVersion: 0.4.36
diff --git a/actions/ql/lib/qlpack.yml b/actions/ql/lib/qlpack.yml
index cf1232c01fb..ae4a57aa944 100644
--- a/actions/ql/lib/qlpack.yml
+++ b/actions/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-all
-version: 0.4.36-dev
+version: 0.4.37-dev
 library: true
 warnOnImplicitThis: true
 dependencies:
diff --git a/actions/ql/src/CHANGELOG.md b/actions/ql/src/CHANGELOG.md
index 0a7fa1ce830..1670f0af5be 100644
--- a/actions/ql/src/CHANGELOG.md
+++ b/actions/ql/src/CHANGELOG.md
@@ -1,3 +1,17 @@
+## 0.6.28
+
+### Query Metadata Changes
+
+* Adjusted the name of `actions/untrusted-checkout/high` to more clearly describe which parts of the scenario are in a privileged context.
+
+### Minor Analysis Improvements
+
+* The `actions/unpinned-tag` query now analyzes composite action metadata (`action.yml`/`action.yaml` files) in addition to workflow files, providing more comprehensive detection of unpinned action references across the entire Actions ecosystem.
+
+### Bug Fixes
+
+* Fixed help file descriptions for queries: `actions/untrusted-checkout/critical`, `actions/untrusted-checkout/high`, `actions/untrusted-checkout/medium`. Previously the messages were unclear as to why and how the vulnerabilities could occur. 
+
 ## 0.6.27
 
 No user-facing changes.
diff --git a/actions/ql/src/change-notes/2026-04-15-untrusted-checkout-improvements-helpfile.md b/actions/ql/src/change-notes/2026-04-15-untrusted-checkout-improvements-helpfile.md
deleted file mode 100644
index 2555bc03d3d..00000000000
--- a/actions/ql/src/change-notes/2026-04-15-untrusted-checkout-improvements-helpfile.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: fix
----
-* Fixed help file descriptions for queries: `actions/untrusted-checkout/critical`, `actions/untrusted-checkout/high`, `actions/untrusted-checkout/medium`. Previously the messages were unclear as to why and how the vulnerabilities could occur. 
\ No newline at end of file
diff --git a/actions/ql/src/change-notes/2026-04-15-untrusted-checkout-improvements-metadata.md b/actions/ql/src/change-notes/2026-04-15-untrusted-checkout-improvements-metadata.md
deleted file mode 100644
index 78f97da0f17..00000000000
--- a/actions/ql/src/change-notes/2026-04-15-untrusted-checkout-improvements-metadata.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: queryMetadata
----
-* Adjusted the name of `actions/untrusted-checkout/high` to more clearly describe which parts of the scenario are in a privileged context.
\ No newline at end of file
diff --git a/actions/ql/src/change-notes/2026-04-20-unpinned-tag-composite-actions.md b/actions/ql/src/change-notes/2026-04-20-unpinned-tag-composite-actions.md
deleted file mode 100644
index 7e00965a17c..00000000000
--- a/actions/ql/src/change-notes/2026-04-20-unpinned-tag-composite-actions.md
+++ /dev/null
@@ -1,4 +0,0 @@
----
-category: minorAnalysis
----
-* The `actions/unpinned-tag` query now analyzes composite action metadata (`action.yml`/`action.yaml` files) in addition to workflow files, providing more comprehensive detection of unpinned action references across the entire Actions ecosystem.
\ No newline at end of file
diff --git a/actions/ql/src/change-notes/released/0.6.28.md b/actions/ql/src/change-notes/released/0.6.28.md
new file mode 100644
index 00000000000..23a7aa24ee3
--- /dev/null
+++ b/actions/ql/src/change-notes/released/0.6.28.md
@@ -0,0 +1,13 @@
+## 0.6.28
+
+### Query Metadata Changes
+
+* Adjusted the name of `actions/untrusted-checkout/high` to more clearly describe which parts of the scenario are in a privileged context.
+
+### Minor Analysis Improvements
+
+* The `actions/unpinned-tag` query now analyzes composite action metadata (`action.yml`/`action.yaml` files) in addition to workflow files, providing more comprehensive detection of unpinned action references across the entire Actions ecosystem.
+
+### Bug Fixes
+
+* Fixed help file descriptions for queries: `actions/untrusted-checkout/critical`, `actions/untrusted-checkout/high`, `actions/untrusted-checkout/medium`. Previously the messages were unclear as to why and how the vulnerabilities could occur. 
diff --git a/actions/ql/src/codeql-pack.release.yml b/actions/ql/src/codeql-pack.release.yml
index 0748b12112f..90f3f09295a 100644
--- a/actions/ql/src/codeql-pack.release.yml
+++ b/actions/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.6.27
+lastReleaseVersion: 0.6.28
diff --git a/actions/ql/src/qlpack.yml b/actions/ql/src/qlpack.yml
index 2c9811c780a..33ab175fb18 100644
--- a/actions/ql/src/qlpack.yml
+++ b/actions/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/actions-queries
-version: 0.6.28-dev
+version: 0.6.29-dev
 library: false
 warnOnImplicitThis: true
 groups: [actions, queries]
diff --git a/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/old.dbscheme b/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/old.dbscheme
new file mode 100644
index 00000000000..ef8d209a22e
--- /dev/null
+++ b/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/old.dbscheme
@@ -0,0 +1,2577 @@
+
+/*- 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
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_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 -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file 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
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // 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
+);
+
+builtin_functions(
+    int id: @function 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
+// ... 41 _Decimal64
+// ... 42 _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
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype 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
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function 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
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype 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
+                       | @decltype;
+
+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
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@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
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+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
+);
+
+param_ref_to_this(
+    int expr: @param_ref 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
+| 17 = @ppd_embed
+| 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
+);
+
+embeds(
+    unique int id: @ppd_embed 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
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string 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/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/semmlecode.cpp.dbscheme b/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..837c4e02326
--- /dev/null
+++ b/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/semmlecode.cpp.dbscheme
@@ -0,0 +1,2561 @@
+
+/*- 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
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_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 -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file 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
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // 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
+);
+
+builtin_functions(
+    int id: @function 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
+// ... 41 _Decimal64
+// ... 42 _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
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int variable_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int variable_id: @usertype 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
+                       | @decltype;
+
+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
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@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
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+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
+);
+
+param_ref_to_this(
+    int expr: @param_ref 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
+| 17 = @ppd_embed
+| 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
+);
+
+embeds(
+    unique int id: @ppd_embed 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
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string 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/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/upgrade.properties b/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/upgrade.properties
new file mode 100644
index 00000000000..f77cdddbbe1
--- /dev/null
+++ b/cpp/downgrades/ef8d209a22e27413aaaeff4446f0ecb9fa2c227b/upgrade.properties
@@ -0,0 +1,6 @@
+description: Capture information about one template being generated from another
+compatibility: full
+class_template_generated_from.rel: delete
+function_template_generated_from.rel: delete
+variable_template_generated_from.rel: delete
+alias_template_generated_from.rel: delete
diff --git a/cpp/ql/lib/CHANGELOG.md b/cpp/ql/lib/CHANGELOG.md
index 828b8779117..3b95c10fbb5 100644
--- a/cpp/ql/lib/CHANGELOG.md
+++ b/cpp/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 10.1.1
+
+### Minor Analysis Improvements
+
+* The `RemoteFlowSourceFunction` model for `fscanf` (and variants) now implements `hasSocketInput` to reflect that these functions may read from a socket.
+
 ## 10.1.0
 
 ### New Features
diff --git a/cpp/ql/lib/change-notes/2026-05-21-generated-from.md b/cpp/ql/lib/change-notes/2026-05-21-generated-from.md
new file mode 100644
index 00000000000..bf3ddcb1070
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2026-05-21-generated-from.md
@@ -0,0 +1,4 @@
+---
+category: feature
+---
+* Added a `getOriginalTemplate` predicate to `TemplateClass`, `TemplateFunction`, `TemplateVariable`, and `AliasTemplateType`, which yields the class member template the template was generated from. The predicates only have results for templates that are members of class template instantiations.
diff --git a/cpp/ql/lib/change-notes/2026-05-15-hasSocketInput-for-fscanf.md b/cpp/ql/lib/change-notes/released/10.1.1.md
similarity index 64%
rename from cpp/ql/lib/change-notes/2026-05-15-hasSocketInput-for-fscanf.md
rename to cpp/ql/lib/change-notes/released/10.1.1.md
index 842d52dd8bf..f89a429fae6 100644
--- a/cpp/ql/lib/change-notes/2026-05-15-hasSocketInput-for-fscanf.md
+++ b/cpp/ql/lib/change-notes/released/10.1.1.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
-* The `RemoteFlowSourceFunction` model for `fscanf` (and variants) now implements `hasSocketInput` to reflect that these functions may read from a socket.
\ No newline at end of file
+## 10.1.1
+
+### Minor Analysis Improvements
+
+* The `RemoteFlowSourceFunction` model for `fscanf` (and variants) now implements `hasSocketInput` to reflect that these functions may read from a socket.
diff --git a/cpp/ql/lib/codeql-pack.release.yml b/cpp/ql/lib/codeql-pack.release.yml
index a85b2d36d7c..940a668bbf3 100644
--- a/cpp/ql/lib/codeql-pack.release.yml
+++ b/cpp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 10.1.0
+lastReleaseVersion: 10.1.1
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index 88d4dafaebb..bca102a1048 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-all
-version: 10.1.1-dev
+version: 10.1.2-dev
 groups: cpp
 dbscheme: semmlecode.cpp.dbscheme
 extractor: cpp
diff --git a/cpp/ql/lib/semmle/code/cpp/Class.qll b/cpp/ql/lib/semmle/code/cpp/Class.qll
index e67a9e76a7a..708cbdb4d50 100644
--- a/cpp/ql/lib/semmle/code/cpp/Class.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Class.qll
@@ -856,8 +856,10 @@ class AbstractClass extends Class {
 
 /**
  * A class template (this class also finds partial specializations
- * of class templates).  For example in the following code there is a
- * `MyTemplateClass<T>` template:
+ * of class templates).
+ *
+ * For example in the following code there is a `MyTemplateClass<T>`
+ * template:
  * ```
  * template<class T>
  * class MyTemplateClass {
@@ -893,6 +895,29 @@ class TemplateClass extends Class {
   }
 
   override string getAPrimaryQlClass() { result = "TemplateClass" }
+
+  /**
+   * Gets the class member template this template was generated from.
+   *
+   * This predicate only has results for templates that are members of class
+   * template instantiations. For example, for `MyTemplateClass<int>::C<S>`
+   * in the following code, the result is `MyTemplateClass<T>::C<S>`.
+   * ```cpp
+   * template<class T>
+   * class MyTemplateClass {
+   *   template<class S>
+   *   class C {
+   *     ...
+   *   };
+   * };
+   *
+   * template
+   * class MyTemplateClass<int>;
+   * ```
+   */
+  TemplateClass getOriginalTemplate() {
+    class_template_generated_from(underlyingElement(this), unresolveElement(result))
+  }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/Function.qll b/cpp/ql/lib/semmle/code/cpp/Function.qll
index 8d93ac0f2a3..f97addd2a0b 100644
--- a/cpp/ql/lib/semmle/code/cpp/Function.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Function.qll
@@ -828,6 +828,27 @@ class TemplateFunction extends Function {
    * such things -- see FunctionTemplateSpecialization for further details.
    */
   FunctionTemplateSpecialization getASpecialization() { result.getPrimaryTemplate() = this }
+
+  /**
+   * Gets the class member template this template was generated from.
+   *
+   * This predicate only has results for templates that are members of class
+   * template instantiations. For example, for `MyTemplateClass<int>::f<S>`
+   * in the following code, the result is `MyTemplateClass<T>::f<S>`.
+   * ```cpp
+   * template<class T>
+   * class MyTemplateClass {
+   *   template<class S>
+   *   S f();
+   * };
+   *
+   * template
+   * class MyTemplateClass<int>;
+   * ```
+   */
+  TemplateFunction getOriginalTemplate() {
+    function_template_generated_from(underlyingElement(this), unresolveElement(result))
+  }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/TypedefType.qll b/cpp/ql/lib/semmle/code/cpp/TypedefType.qll
index 08d02eadb4d..69eb8f881d2 100644
--- a/cpp/ql/lib/semmle/code/cpp/TypedefType.qll
+++ b/cpp/ql/lib/semmle/code/cpp/TypedefType.qll
@@ -130,6 +130,27 @@ class AliasTemplateType extends TypeAliasType {
    * ```
    */
   TypeAliasType getAnInstantiation() { result.isConstructedFrom(this) }
+
+  /**
+   * Gets the class member template this template was generated from.
+   *
+   * This predicate only has results for templates that are members of class
+   * template instantiations. For example, for `MyTemplateClass<int>::t<S>`
+   * in the following code, the result is `MyTemplateClass<T>::t<S>`.
+   * ```cpp
+   * template<class T>
+   * class MyTemplateClass {
+   *   template<class S>
+   *   using t = S;
+   * };
+   *
+   * template
+   * class MyTemplateClass<int>;
+   * ```
+   */
+  AliasTemplateType getOriginalTemplate() {
+    alias_template_generated_from(underlyingElement(this), unresolveElement(result))
+  }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/Variable.qll b/cpp/ql/lib/semmle/code/cpp/Variable.qll
index 8e68cc1927f..be46d69b41f 100644
--- a/cpp/ql/lib/semmle/code/cpp/Variable.qll
+++ b/cpp/ql/lib/semmle/code/cpp/Variable.qll
@@ -614,6 +614,27 @@ class TemplateVariable extends Variable {
     result.isConstructedFrom(this) and
     not result.isSpecialization()
   }
+
+  /**
+   * Gets the class member template this template was generated from.
+   *
+   * This predicate only has results for templates that are members of class
+   * template instantiations. For example, for `MyTemplateClass<int>::x<S>`
+   * in the following code, the result is `MyTemplateClass<T>::x<S>`.
+   * ```cpp
+   * template<class T>
+   * class MyTemplateClass {
+   *   template<class S>
+   *   static S x;
+   * };
+   *
+   * template
+   * class MyTemplateClass<int>;
+   * ```
+   */
+  TemplateVariable getOriginalTemplate() {
+    variable_template_generated_from(underlyingElement(this), unresolveElement(result))
+  }
 }
 
 /**
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 837c4e02326..ef8d209a22e 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -912,6 +912,10 @@ class_template_argument_value(
     int index: int ref,
     int arg_value: @expr ref
 );
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
 
 @user_or_decltype = @usertype | @decltype;
 
@@ -943,6 +947,10 @@ function_template_argument_value(
     int index: int ref,
     int arg_value: @expr ref
 );
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
 
 is_variable_template(unique int id: @variable ref);
 variable_instantiation(
@@ -959,6 +967,10 @@ variable_template_argument_value(
     int index: int ref,
     int arg_value: @expr ref
 );
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
 
 is_alias_template(unique int id: @usertype ref);
 alias_instantiation(
@@ -966,15 +978,19 @@ alias_instantiation(
     int from: @usertype ref
 );
 alias_template_argument(
-    int variable_id: @usertype ref,
+    int type_id: @usertype ref,
     int index: int ref,
     int arg_type: @type ref
 );
 alias_template_argument_value(
-    int variable_id: @usertype ref,
+    int type_id: @usertype ref,
     int index: int ref,
     int arg_value: @expr ref
 );
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
 
 template_template_instantiation(
     int to: @usertype ref,
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index f33a1a43f8b..0b97bb3329b 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -2,7 +2,7 @@
     <typesizes>
         <e>
             <k>@compilation</k>
-            <v>12549</v>
+            <v>12550</v>
         </e>
         <e>
             <k>@externalDataElement</k>
@@ -10,7 +10,7 @@
         </e>
         <e>
             <k>@file</k>
-            <v>64730</v>
+            <v>64732</v>
         </e>
         <e>
             <k>@folder</k>
@@ -20,10 +20,6 @@
             <k>@diagnostic</k>
             <v>356</v>
         </e>
-        <e>
-            <k>@location_default</k>
-            <v>46452145</v>
-        </e>
         <e>
             <k>@trap</k>
             <v>1</v>
@@ -32,6 +28,10 @@
             <k>@tag</k>
             <v>1</v>
         </e>
+        <e>
+            <k>@location_default</k>
+            <v>46452143</v>
+        </e>
         <e>
             <k>@source_file</k>
             <v>1</v>
@@ -42,7 +42,7 @@
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>40321988</v>
+            <v>40321986</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
@@ -58,7 +58,7 @@
         </e>
         <e>
             <k>@constructor</k>
-            <v>687785</v>
+            <v>687816</v>
         </e>
         <e>
             <k>@destructor</k>
@@ -82,15 +82,15 @@
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4144463</v>
+            <v>4144339</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>9432031</v>
+            <v>9431661</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>1610929</v>
+            <v>1610928</v>
         </e>
         <e>
             <k>@namespace_decl</k>
@@ -98,7 +98,7 @@
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>265914</v>
+            <v>265912</v>
         </e>
         <e>
             <k>@using_directive</k>
@@ -126,7 +126,7 @@
         </e>
         <e>
             <k>@localvariable</k>
-            <v>724660</v>
+            <v>724508</v>
         </e>
         <e>
             <k>@enumconstant</k>
@@ -378,7 +378,7 @@
         </e>
         <e>
             <k>@routineptr</k>
-            <v>673469</v>
+            <v>673499</v>
         </e>
         <e>
             <k>@reference</k>
@@ -386,7 +386,7 @@
         </e>
         <e>
             <k>@gnu_vector</k>
-            <v>670</v>
+            <v>671</v>
         </e>
         <e>
             <k>@routinereference</k>
@@ -404,10 +404,6 @@
             <k>@scalable_vector</k>
             <v>1</v>
         </e>
-        <e>
-            <k>@decltype</k>
-            <v>101817</v>
-        </e>
         <e>
             <k>@typeof</k>
             <v>811</v>
@@ -488,9 +484,13 @@
             <k>@remove_reference</k>
             <v>5688</v>
         </e>
+        <e>
+            <k>@decltype</k>
+            <v>101817</v>
+        </e>
         <e>
             <k>@struct</k>
-            <v>1036608</v>
+            <v>1036640</v>
         </e>
         <e>
             <k>@union</k>
@@ -502,11 +502,11 @@
         </e>
         <e>
             <k>@template_parameter</k>
-            <v>862599</v>
+            <v>862626</v>
         </e>
         <e>
             <k>@alias</k>
-            <v>1757438</v>
+            <v>1757492</v>
         </e>
         <e>
             <k>@unknown_usertype</k>
@@ -522,7 +522,7 @@
         </e>
         <e>
             <k>@proxy_class</k>
-            <v>50199</v>
+            <v>50200</v>
         </e>
         <e>
             <k>@scoped_enum</k>
@@ -530,7 +530,7 @@
         </e>
         <e>
             <k>@template_struct</k>
-            <v>210473</v>
+            <v>210479</v>
         </e>
         <e>
             <k>@template_class</k>
@@ -554,7 +554,7 @@
         </e>
         <e>
             <k>@routinetype</k>
-            <v>594947</v>
+            <v>594974</v>
         </e>
         <e>
             <k>@ptrtomember</k>
@@ -582,15 +582,15 @@
         </e>
         <e>
             <k>@alignas</k>
-            <v>2161</v>
+            <v>2160</v>
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>16428</v>
+            <v>16429</v>
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>71325</v>
+            <v>71243</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
@@ -610,11 +610,11 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>491380</v>
+            <v>491402</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>760573</v>
+            <v>759702</v>
         </e>
         <e>
             <k>@comment</k>
@@ -630,15 +630,15 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>3051466</v>
+            <v>3051489</v>
         </e>
         <e>
             <k>@value</k>
-            <v>13547188</v>
+            <v>13547187</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>2245055</v>
+            <v>2245054</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -662,7 +662,7 @@
         </e>
         <e>
             <k>@unaryplusexpr</k>
-            <v>4110</v>
+            <v>4109</v>
         </e>
         <e>
             <k>@complementexpr</k>
@@ -670,7 +670,7 @@
         </e>
         <e>
             <k>@notexpr</k>
-            <v>355911</v>
+            <v>355910</v>
         </e>
         <e>
             <k>@postincrexpr</k>
@@ -710,7 +710,7 @@
         </e>
         <e>
             <k>@remexpr</k>
-            <v>15757</v>
+            <v>15758</v>
         </e>
         <e>
             <k>@paddexpr</k>
@@ -782,7 +782,7 @@
         </e>
         <e>
             <k>@assignmulexpr</k>
-            <v>11102</v>
+            <v>11103</v>
         </e>
         <e>
             <k>@assigndivexpr</k>
@@ -838,7 +838,7 @@
         </e>
         <e>
             <k>@callexpr</k>
-            <v>260811</v>
+            <v>260823</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -866,7 +866,7 @@
         </e>
         <e>
             <k>@runtime_alignof</k>
-            <v>50291</v>
+            <v>50293</v>
         </e>
         <e>
             <k>@expr_stmt</k>
@@ -874,7 +874,7 @@
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>5708297</v>
+            <v>5708340</v>
         </e>
         <e>
             <k>@type_operand</k>
@@ -890,7 +890,7 @@
         </e>
         <e>
             <k>@literal</k>
-            <v>8053163</v>
+            <v>8052387</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -898,11 +898,11 @@
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>6029389</v>
+            <v>6029390</v>
         </e>
         <e>
             <k>@temp_init</k>
-            <v>974915</v>
+            <v>974928</v>
         </e>
         <e>
             <k>@errorexpr</k>
@@ -910,11 +910,11 @@
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1870180</v>
+            <v>1870000</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2077068</v>
+            <v>2077162</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
@@ -982,23 +982,23 @@
         </e>
         <e>
             <k>@delete_expr</k>
-            <v>11298</v>
+            <v>11299</v>
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>23683</v>
+            <v>23664</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>406396</v>
+            <v>406399</v>
         </e>
         <e>
             <k>@braced_init_list</k>
-            <v>2091</v>
+            <v>2092</v>
         </e>
         <e>
             <k>@type_id</k>
-            <v>47139</v>
+            <v>47141</v>
         </e>
         <e>
             <k>@sizeof_pack</k>
@@ -1106,7 +1106,7 @@
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>111043</v>
+            <v>111048</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
@@ -1122,7 +1122,7 @@
         </e>
         <e>
             <k>@dtordirectdestruct</k>
-            <v>38824</v>
+            <v>38826</v>
         </e>
         <e>
             <k>@dtorvirtualdestruct</k>
@@ -1130,7 +1130,7 @@
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>39193</v>
+            <v>39195</v>
         </e>
         <e>
             <k>@static_cast</k>
@@ -1142,7 +1142,7 @@
         </e>
         <e>
             <k>@const_cast</k>
-            <v>24072</v>
+            <v>24073</v>
         </e>
         <e>
             <k>@dynamic_cast</k>
@@ -1154,7 +1154,7 @@
         </e>
         <e>
             <k>@param_ref</k>
-            <v>163595</v>
+            <v>163499</v>
         </e>
         <e>
             <k>@noopexpr</k>
@@ -1186,7 +1186,7 @@
         </e>
         <e>
             <k>@istrivialexpr</k>
-            <v>3309</v>
+            <v>3310</v>
         </e>
         <e>
             <k>@isstandardlayoutexpr</k>
@@ -1254,11 +1254,11 @@
         </e>
         <e>
             <k>@isfinalexpr</k>
-            <v>9253</v>
+            <v>9254</v>
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>30280</v>
+            <v>30165</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1430,7 +1430,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>841809</v>
+            <v>841815</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1574,15 +1574,15 @@
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>156741</v>
+            <v>156745</v>
         </e>
         <e>
             <k>@stmt_label</k>
-            <v>77468</v>
+            <v>77471</v>
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1233357</v>
+            <v>1233416</v>
         </e>
         <e>
             <k>@stmt_block</k>
@@ -1598,11 +1598,11 @@
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>830946</v>
+            <v>830953</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>409304</v>
+            <v>409307</v>
         </e>
         <e>
             <k>@stmt_asm</k>
@@ -1614,7 +1614,7 @@
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>426753</v>
+            <v>426756</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1626,7 +1626,7 @@
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>26275</v>
+            <v>26287</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
@@ -1646,11 +1646,11 @@
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>6156</v>
+            <v>6157</v>
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>43026</v>
+            <v>43039</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
@@ -1698,7 +1698,7 @@
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>316207</v>
+            <v>316217</v>
         </e>
         <e>
             <k>@ppd_define</k>
@@ -1718,7 +1718,7 @@
         </e>
         <e>
             <k>@ppd_line</k>
-            <v>18779</v>
+            <v>18775</v>
         </e>
         <e>
             <k>@ppd_error</k>
@@ -1780,11 +1780,11 @@
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>12549</cardinality>
+            <cardinality>12550</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12549</v>
+                    <v>12550</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1802,7 +1802,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12549</v>
+                                    <v>12550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1828,11 +1828,11 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1004725</cardinality>
+            <cardinality>1004756</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12549</v>
+                    <v>12550</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -1840,7 +1840,7 @@
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29052</v>
+                    <v>29053</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2168,12 +2168,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13304</v>
+                                    <v>13305</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12591</v>
+                                    <v>12592</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2199,7 +2199,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19238</v>
+                                    <v>19239</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2219,11 +2219,11 @@
         </relation>
         <relation>
             <name>compilation_expanded_args</name>
-            <cardinality>1004725</cardinality>
+            <cardinality>1004756</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12549</v>
+                    <v>12550</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -2231,7 +2231,7 @@
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29052</v>
+                    <v>29053</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2559,12 +2559,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13304</v>
+                                    <v>13305</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12591</v>
+                                    <v>12592</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2590,7 +2590,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19238</v>
+                                    <v>19239</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2920,7 +2920,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>19828</v>
+                    <v>17867</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3001,47 +3001,52 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>435</v>
+                                    <v>490</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>926</v>
+                                    <v>871</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>9</b>
-                                    <v>217</v>
+                                    <a>5</a>
+                                    <b>7</b>
+                                    <v>163</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
+                                    <a>8</a>
                                     <b>10</b>
-                                    <v>108</v>
+                                    <v>217</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>163</v>
+                                    <v>108</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>13</b>
+                                    <b>12</b>
                                     <v>217</v>
                                 </b>
                                 <b>
                                     <a>14</a>
-                                    <b>17</b>
+                                    <b>18</b>
+                                    <v>163</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>21</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>19</a>
-                                    <b>23</b>
+                                    <a>21</a>
+                                    <b>53</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>122</b>
-                                    <v>217</v>
+                                    <a>116</a>
+                                    <b>117</b>
+                                    <v>54</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3109,42 +3114,47 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1361</v>
+                                    <v>926</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1089</v>
+                                    <v>1470</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>108</v>
+                                    <v>217</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>653</v>
+                                    <v>490</v>
                                 </b>
                                 <b>
                                     <a>7</a>
+                                    <b>8</b>
+                                    <v>326</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
                                     <b>9</b>
-                                    <v>381</v>
+                                    <v>217</v>
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>12</b>
+                                    <b>13</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>41</b>
+                                    <a>17</a>
+                                    <b>46</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>46</a>
-                                    <b>96</b>
-                                    <v>163</v>
+                                    <a>51</a>
+                                    <b>98</b>
+                                    <v>108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3192,18 +3202,18 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>5</a>
-                                    <b>6</b>
-                                    <v>54</v>
-                                </b>
-                                <b>
-                                    <a>202</a>
-                                    <b>203</b>
                                     <v>108</v>
                                 </b>
+                                <b>
+                                    <a>166</a>
+                                    <b>167</b>
+                                    <v>54</v>
+                                </b>
+                                <b>
+                                    <a>179</a>
+                                    <b>180</b>
+                                    <v>54</v>
+                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -3218,22 +3228,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14108</v>
+                                    <v>11548</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4140</v>
+                                    <v>4249</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>42</b>
-                                    <v>1525</v>
+                                    <b>4</b>
+                                    <v>1416</v>
                                 </b>
                                 <b>
-                                    <a>42</a>
-                                    <b>43</b>
-                                    <v>54</v>
+                                    <a>4</a>
+                                    <b>45</b>
+                                    <v>653</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3249,22 +3259,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13673</v>
+                                    <v>10949</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3486</v>
+                                    <v>3922</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1416</v>
+                                    <v>1307</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>63</b>
-                                    <v>1252</v>
+                                    <b>9</b>
+                                    <v>1416</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>67</b>
+                                    <v>272</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3280,12 +3295,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17159</v>
+                                    <v>16505</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2669</v>
+                                    <v>1361</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3561,19 +3576,19 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>12549</cardinality>
+            <cardinality>12550</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12549</v>
+                    <v>12550</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>9184</v>
+                    <v>8922</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>209</v>
+                    <v>167</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3587,7 +3602,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12549</v>
+                                    <v>12550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3603,7 +3618,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12549</v>
+                                    <v>12550</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3619,16 +3634,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7664</v>
+                                    <v>7161</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1006</v>
+                                    <v>1247</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>35</b>
+                                    <b>31</b>
                                     <v>513</v>
                                 </b>
                             </bs>
@@ -3645,12 +3660,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8555</v>
+                                    <v>8261</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>629</v>
+                                    <v>660</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3666,71 +3681,61 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52</v>
+                                    <v>41</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>20</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
+                                    <v>20</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
+                                    <a>22</a>
+                                    <b>23</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>12</b>
+                                    <a>25</a>
+                                    <b>26</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>21</b>
+                                    <a>28</a>
+                                    <b>29</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>35</a>
-                                    <b>36</b>
+                                    <a>76</a>
+                                    <b>77</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>43</a>
-                                    <b>44</b>
+                                    <a>290</a>
+                                    <b>291</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>135</a>
-                                    <b>136</b>
+                                    <a>350</a>
+                                    <b>351</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>279</a>
-                                    <b>280</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>298</a>
-                                    <b>299</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>325</a>
-                                    <b>326</b>
+                                    <a>362</a>
+                                    <b>363</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -3747,71 +3752,61 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52</v>
+                                    <v>41</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>20</v>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
+                                    <v>20</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>17</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>11</b>
+                                    <a>22</a>
+                                    <b>23</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>12</b>
+                                    <a>25</a>
+                                    <b>26</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>21</b>
+                                    <a>27</a>
+                                    <b>28</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>34</a>
-                                    <b>35</b>
+                                    <a>71</a>
+                                    <b>72</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>42</a>
-                                    <b>43</b>
+                                    <a>168</a>
+                                    <b>169</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>131</a>
-                                    <b>132</b>
+                                    <a>255</a>
+                                    <b>256</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>163</a>
-                                    <b>164</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>238</a>
-                                    <b>239</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>246</a>
-                                    <b>247</b>
+                                    <a>302</a>
+                                    <b>303</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -4049,11 +4044,11 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>46452145</cardinality>
+            <cardinality>46452143</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>46452145</v>
+                    <v>46452143</v>
                 </e>
                 <e>
                     <k>file</k>
@@ -4069,7 +4064,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>7399913</v>
+                    <v>7399912</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -4087,7 +4082,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46452145</v>
+                                    <v>46452143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4103,7 +4098,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46452145</v>
+                                    <v>46452143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4119,7 +4114,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46452145</v>
+                                    <v>46452143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4135,7 +4130,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46452145</v>
+                                    <v>46452143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4151,7 +4146,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46452145</v>
+                                    <v>46452143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5107,7 +5102,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4887912</v>
+                                    <v>4887911</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5241,7 +5236,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4956326</v>
+                                    <v>4956325</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5581,15 +5576,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>64730</cardinality>
+            <cardinality>64732</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>64730</v>
+                    <v>64732</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>64730</v>
+                    <v>64732</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5603,7 +5598,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64730</v>
+                                    <v>64732</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5619,7 +5614,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64730</v>
+                                    <v>64732</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5677,7 +5672,7 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>77007</cardinality>
+            <cardinality>77009</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -5685,7 +5680,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>77007</v>
+                    <v>77009</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5750,7 +5745,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77007</v>
+                                    <v>77009</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7526,7 +7521,7 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>4169478</cardinality>
+            <cardinality>4169606</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -7538,11 +7533,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>58282</v>
+                    <v>58284</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>39221</v>
+                    <v>39223</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7802,7 +7797,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>4067</v>
+                                    <v>4068</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -7858,7 +7853,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58282</v>
+                                    <v>58284</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7884,7 +7879,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4067</v>
+                                    <v>4068</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -7894,7 +7889,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>3396</v>
+                                    <v>3397</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -7919,7 +7914,7 @@
                                 <b>
                                     <a>41</a>
                                     <b>95</b>
-                                    <v>4434</v>
+                                    <v>4435</v>
                                 </b>
                                 <b>
                                     <a>95</a>
@@ -8021,7 +8016,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39211</v>
+                                    <v>39212</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8042,7 +8037,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3375</v>
+                                    <v>3376</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8052,7 +8047,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3029</v>
+                                    <v>3030</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -8092,7 +8087,7 @@
                                 <b>
                                     <a>66</a>
                                     <b>92</b>
-                                    <v>3050</v>
+                                    <v>3051</v>
                                 </b>
                                 <b>
                                     <a>92</a>
@@ -8117,11 +8112,11 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>150057036</cardinality>
+            <cardinality>150057030</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24680986</v>
+                    <v>24680985</v>
                 </e>
                 <e>
                     <k>inv</k>
@@ -8245,7 +8240,7 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48755655</cardinality>
+            <cardinality>48755653</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -8267,7 +8262,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3848270</v>
+                                    <v>3848269</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8287,7 +8282,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>535378</v>
+                                    <v>535377</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -8383,11 +8378,11 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>40403427</cardinality>
+            <cardinality>40403426</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>40403427</v>
+                    <v>40403426</v>
                 </e>
                 <e>
                     <k>macro_id</k>
@@ -8413,7 +8408,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40403427</v>
+                                    <v>40403426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8429,7 +8424,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40403427</v>
+                                    <v>40403426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8445,7 +8440,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40403427</v>
+                                    <v>40403426</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8709,11 +8704,11 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>33697132</cardinality>
+            <cardinality>33697131</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33697132</v>
+                    <v>33697131</v>
                 </e>
                 <e>
                     <k>parent_id</k>
@@ -8731,7 +8726,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33697132</v>
+                                    <v>33697131</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8777,15 +8772,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>6005316</cardinality>
+            <cardinality>6005902</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4196688</v>
+                    <v>4197329</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2266152</v>
+                    <v>2266082</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8799,12 +8794,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3275887</v>
+                                    <v>3276557</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>487611</v>
+                                    <v>487596</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8814,7 +8809,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>411570</v>
+                                    <v>411558</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -8835,27 +8830,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1328971</v>
+                                    <v>1328930</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>479784</v>
+                                    <v>479769</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7805</v>
+                                    <v>7804</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>425598</v>
+                                    <v>425585</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>522</b>
-                                    <v>23992</v>
+                                    <v>23991</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8865,11 +8860,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>81889986</cardinality>
+            <cardinality>81891296</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26089169</v>
+                    <v>26088765</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -8877,7 +8872,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>340730</v>
+                    <v>340741</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8891,22 +8886,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9606074</v>
+                                    <v>9605164</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9700727</v>
+                                    <v>9701025</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4965932</v>
+                                    <v>4966085</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1816434</v>
+                                    <v>1816490</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8922,22 +8917,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9787359</v>
+                                    <v>9786454</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9718183</v>
+                                    <v>9718482</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4810386</v>
+                                    <v>4810534</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1773238</v>
+                                    <v>1773293</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8962,7 +8957,7 @@
                                 </b>
                                 <b>
                                     <a>646904</a>
-                                    <b>2488393</b>
+                                    <b>2488278</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -9005,52 +9000,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39410</v>
+                                    <v>39411</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>61868</v>
+                                    <v>61870</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20853</v>
+                                    <v>20854</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>34451</v>
+                                    <v>34452</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>38959</v>
+                                    <v>38961</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>30530</v>
+                                    <v>30531</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>28779</v>
+                                    <v>28780</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>25686</v>
+                                    <v>25687</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>57</b>
-                                    <v>26934</v>
+                                    <v>26935</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>517</b>
-                                    <v>25822</v>
+                                    <v>25823</v>
                                 </b>
                                 <b>
                                     <a>518</a>
@@ -9071,12 +9066,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241381</v>
+                                    <v>241388</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>89211</v>
+                                    <v>89214</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -9091,11 +9086,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>81889986</cardinality>
+            <cardinality>81891296</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26089169</v>
+                    <v>26088765</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -9103,7 +9098,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>206363</v>
+                    <v>206369</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9117,22 +9112,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9606074</v>
+                                    <v>9605164</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9700727</v>
+                                    <v>9701025</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4965932</v>
+                                    <v>4966085</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1816434</v>
+                                    <v>1816490</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9148,22 +9143,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12543862</v>
+                                    <v>12543042</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8367978</v>
+                                    <v>8368235</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4194263</v>
+                                    <v>4194392</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>983064</v>
+                                    <v>983095</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9188,7 +9183,7 @@
                                 </b>
                                 <b>
                                     <a>646904</a>
-                                    <b>2488393</b>
+                                    <b>2488278</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -9236,12 +9231,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26661</v>
+                                    <v>26662</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>43143</v>
+                                    <v>43144</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -9271,17 +9266,17 @@
                                 <b>
                                     <a>19</a>
                                     <b>51</b>
-                                    <v>15642</v>
+                                    <v>15643</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>251</b>
-                                    <v>15495</v>
+                                    <v>15496</v>
                                 </b>
                                 <b>
                                     <a>251</a>
-                                    <b>1169172</b>
-                                    <v>9435</v>
+                                    <b>1169057</b>
+                                    <v>9436</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9297,17 +9292,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>104277</v>
+                                    <v>104280</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>88257</v>
+                                    <v>88259</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>66</b>
-                                    <v>13828</v>
+                                    <v>13829</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9508,26 +9503,26 @@
         </relation>
         <relation>
             <name>builtin_functions</name>
-            <cardinality>30698</cardinality>
+            <cardinality>30699</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30698</v>
+                    <v>30699</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1123577</cardinality>
+            <cardinality>1123627</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1120257</v>
+                    <v>1120308</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1123577</v>
+                    <v>1123627</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9541,7 +9536,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1117475</v>
+                                    <v>1117525</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9562,7 +9557,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1123577</v>
+                                    <v>1123627</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9572,7 +9567,7 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4012557</cardinality>
+            <cardinality>4012556</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -10110,11 +10105,11 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4150369</cardinality>
+            <cardinality>4150246</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4144463</v>
+                    <v>4144339</v>
                 </e>
                 <e>
                     <k>function</k>
@@ -10126,7 +10121,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1668761</v>
+                    <v>1668760</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -10144,7 +10139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4144463</v>
+                                    <v>4144339</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10160,7 +10155,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4138556</v>
+                                    <v>4138433</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10181,7 +10176,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4144463</v>
+                                    <v>4144339</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10197,7 +10192,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4144463</v>
+                                    <v>4144339</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10213,12 +10208,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3812113</v>
+                                    <v>3812236</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>158976</v>
+                                    <v>158853</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10271,12 +10266,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3832293</v>
+                                    <v>3832416</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>138796</v>
+                                    <v>138673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10311,7 +10306,7 @@
                                 </b>
                                 <b>
                                     <a>463</a>
-                                    <b>10298</b>
+                                    <b>10297</b>
                                     <v>1107</v>
                                 </b>
                             </bs>
@@ -10436,12 +10431,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>127968</v>
+                                    <v>128091</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>3169</b>
-                                    <v>36175</v>
+                                    <v>36052</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10530,12 +10525,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2387477</v>
+                                    <v>2387600</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>247939</v>
+                                    <v>247816</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10556,12 +10551,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2405934</v>
+                                    <v>2406057</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>229974</v>
+                                    <v>229851</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10896,15 +10891,15 @@
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>139575</cardinality>
+            <cardinality>139581</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>139575</v>
+                    <v>139581</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>139139</v>
+                    <v>139145</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10918,7 +10913,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>139575</v>
+                                    <v>139581</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10934,7 +10929,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>138703</v>
+                                    <v>138709</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10949,22 +10944,22 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>1147165</cardinality>
+            <cardinality>1147042</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1147165</v>
+                    <v>1147042</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_typedef_type</name>
-            <cardinality>2756</cardinality>
+            <cardinality>2755</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>2756</v>
+                    <v>2755</v>
                 </e>
                 <e>
                     <k>typedeftype_id</k>
@@ -10982,7 +10977,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2756</v>
+                                    <v>2755</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11219,11 +11214,11 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7209190</cardinality>
+            <cardinality>7208821</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7209190</v>
+                    <v>7208821</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -11231,7 +11226,7 @@
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3482963</v>
+                    <v>3482840</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11245,7 +11240,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7209190</v>
+                                    <v>7208821</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11261,7 +11256,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7209190</v>
+                                    <v>7208821</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11296,12 +11291,12 @@
                                 </b>
                                 <b>
                                     <a>343</a>
-                                    <b>16207</b>
+                                    <b>16206</b>
                                     <v>615</v>
                                 </b>
                                 <b>
-                                    <a>28306</a>
-                                    <b>28307</b>
+                                    <a>28305</a>
+                                    <b>28306</b>
                                     <v>123</v>
                                 </b>
                             </bs>
@@ -11337,12 +11332,12 @@
                                 </b>
                                 <b>
                                     <a>343</a>
-                                    <b>16207</b>
+                                    <b>16206</b>
                                     <v>615</v>
                                 </b>
                                 <b>
-                                    <a>28306</a>
-                                    <b>28307</b>
+                                    <a>28305</a>
+                                    <b>28306</b>
                                     <v>123</v>
                                 </b>
                             </bs>
@@ -11369,7 +11364,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>593823</v>
+                                    <v>593700</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -11405,7 +11400,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>593823</v>
+                                    <v>593700</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -11425,15 +11420,15 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>9438429</cardinality>
+            <cardinality>9438060</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9432031</v>
+                    <v>9431661</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>9094637</v>
+                    <v>9094636</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -11441,7 +11436,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>840902</v>
+                    <v>840901</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -11459,7 +11454,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9432031</v>
+                                    <v>9431661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11475,7 +11470,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9425632</v>
+                                    <v>9425263</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11496,7 +11491,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9432031</v>
+                                    <v>9431661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11512,7 +11507,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9432031</v>
+                                    <v>9431661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11528,12 +11523,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8774469</v>
+                                    <v>8774837</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>320167</v>
+                                    <v>319798</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11549,7 +11544,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9042219</v>
+                                    <v>9042218</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11591,12 +11586,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8852726</v>
+                                    <v>8853095</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>241910</v>
+                                    <v>241540</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11900,12 +11895,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5693376</v>
+                                    <v>5693745</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>468316</v>
+                                    <v>467947</v>
                                 </b>
                                 <b>
                                     <a>20</a>
@@ -11926,12 +11921,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5773110</v>
+                                    <v>5773479</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2935</b>
-                                    <v>417251</v>
+                                    <v>416882</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11968,7 +11963,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6178181</v>
+                                    <v>6178180</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12137,11 +12132,11 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>1610929</cardinality>
+            <cardinality>1610928</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1610929</v>
+                    <v>1610928</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -12163,7 +12158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1610929</v>
+                                    <v>1610928</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12179,7 +12174,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1610929</v>
+                                    <v>1610928</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12295,7 +12290,7 @@
         </relation>
         <relation>
             <name>type_requires</name>
-            <cardinality>7633</cardinality>
+            <cardinality>7634</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -12734,19 +12729,19 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>270034</cardinality>
+            <cardinality>270032</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>270034</v>
+                    <v>270032</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>58576</v>
+                    <v>58567</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>26651</v>
+                    <v>26652</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12764,7 +12759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270034</v>
+                                    <v>270032</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12780,7 +12775,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270034</v>
+                                    <v>270032</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12796,7 +12791,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270034</v>
+                                    <v>270032</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12812,7 +12807,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50901</v>
+                                    <v>50892</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12838,7 +12833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50901</v>
+                                    <v>50892</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12864,7 +12859,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58576</v>
+                                    <v>58567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12885,12 +12880,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2275</v>
+                                    <v>2285</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1939</v>
+                                    <v>1929</v>
                                 </b>
                                 <b>
                                     <a>145</a>
@@ -12916,12 +12911,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2275</v>
+                                    <v>2285</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1939</v>
+                                    <v>1929</v>
                                 </b>
                                 <b>
                                     <a>145</a>
@@ -12942,7 +12937,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26651</v>
+                                    <v>26652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12961,8 +12956,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>25363</a>
-                                    <b>25364</b>
+                                    <a>25362</a>
+                                    <b>25363</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -12982,8 +12977,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>5373</a>
-                                    <b>5374</b>
+                                    <a>5372</a>
+                                    <b>5373</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -13015,7 +13010,7 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>575831</cardinality>
+            <cardinality>575839</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -13023,7 +13018,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>270034</v>
+                    <v>270032</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13088,22 +13083,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>95847</v>
+                                    <v>95840</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>119395</v>
+                                    <v>119399</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>19951</v>
+                                    <v>19952</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>26514</v>
+                                    <v>26515</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -13726,7 +13721,7 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>6969126</cardinality>
+            <cardinality>6969125</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -14040,7 +14035,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>236496</v>
+                                    <v>236495</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14572,19 +14567,19 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>724660</cardinality>
+            <cardinality>724508</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>724660</v>
+                    <v>724508</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53317</v>
+                    <v>53305</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>101453</v>
+                    <v>101431</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14598,7 +14593,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724660</v>
+                                    <v>724508</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14614,7 +14609,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724660</v>
+                                    <v>724508</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14630,32 +14625,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28825</v>
+                                    <v>28819</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7801</v>
+                                    <v>7799</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4034</v>
+                                    <v>4033</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4058</v>
+                                    <v>4057</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>4106</v>
+                                    <v>4105</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>163</b>
-                                    <v>4002</v>
+                                    <v>4001</v>
                                 </b>
                                 <b>
                                     <a>164</a>
@@ -14676,17 +14671,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38261</v>
+                                    <v>38253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6707</v>
+                                    <v>6705</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4470</v>
+                                    <v>4469</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -14707,32 +14702,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62429</v>
+                                    <v>62415</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16010</v>
+                                    <v>16007</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6527</v>
+                                    <v>6525</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>8141</v>
+                                    <v>8139</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>137</b>
-                                    <v>7617</v>
+                                    <v>7616</v>
                                 </b>
                                 <b>
                                     <a>137</a>
                                     <b>7546</b>
-                                    <v>727</v>
+                                    <v>726</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14748,17 +14743,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84435</v>
+                                    <v>84417</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8396</v>
+                                    <v>8395</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>7669</v>
+                                    <v>7668</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -14841,15 +14836,15 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>43619</cardinality>
+            <cardinality>43621</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>43619</v>
+                    <v>43621</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>40400</v>
+                    <v>40402</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14863,7 +14858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43619</v>
+                                    <v>43621</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14879,7 +14874,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39562</v>
+                                    <v>39564</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16504,7 +16499,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1926175</v>
+                    <v>1926174</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16757,7 +16752,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1303435</v>
+                                    <v>1303434</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17409,15 +17404,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1757438</cardinality>
+            <cardinality>1757492</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1757438</v>
+                    <v>1757492</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>835004</v>
+                    <v>835030</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17431,7 +17426,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1757438</v>
+                                    <v>1757492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17447,22 +17442,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>660513</v>
+                                    <v>660534</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80561</v>
+                                    <v>80564</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>63744</v>
+                                    <v>63746</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4525</b>
-                                    <v>30184</v>
+                                    <v>30185</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18236,15 +18231,15 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4198876</cardinality>
+            <cardinality>4199005</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4198876</v>
+                    <v>4199005</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>949190</v>
+                    <v>949198</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -18262,7 +18257,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4198876</v>
+                                    <v>4199005</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18278,7 +18273,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4198876</v>
+                                    <v>4199005</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18299,17 +18294,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>161123</v>
+                                    <v>161107</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>71345</v>
+                                    <v>71369</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>33450</b>
-                                    <v>35751</v>
+                                    <v>35752</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18325,12 +18320,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897376</v>
+                                    <v>897382</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>51813</v>
+                                    <v>51815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18465,8 +18460,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>12272</a>
-                                    <b>12273</b>
+                                    <a>12270</a>
+                                    <b>12271</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18482,11 +18477,11 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1420199</cardinality>
+            <cardinality>1420243</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1420199</v>
+                    <v>1420243</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -18508,7 +18503,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1420199</v>
+                                    <v>1420243</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18524,7 +18519,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1420199</v>
+                                    <v>1420243</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18782,11 +18777,11 @@
         </relation>
         <relation>
             <name>usertype_alias_kind</name>
-            <cardinality>1757438</cardinality>
+            <cardinality>1757492</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1757438</v>
+                    <v>1757492</v>
                 </e>
                 <e>
                     <k>alias_kind</k>
@@ -18804,7 +18799,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1757438</v>
+                                    <v>1757492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18835,11 +18830,11 @@
         </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>753465</cardinality>
+            <cardinality>753499</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>753465</v>
+                    <v>753499</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -19050,59 +19045,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>607922</cardinality>
+            <cardinality>607950</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>607922</v>
+                    <v>607950</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1181932</cardinality>
+            <cardinality>1181968</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1181932</v>
+                    <v>1181968</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1402166</cardinality>
+            <cardinality>1402209</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1402166</v>
+                    <v>1402209</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>230414</cardinality>
+            <cardinality>230421</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>230414</v>
+                    <v>230421</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1182540</cardinality>
+            <cardinality>1182545</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1179520</v>
+                    <v>1179556</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>71723</v>
+                    <v>71725</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19116,12 +19111,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1177402</v>
+                                    <v>1177470</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>2117</v>
+                                    <v>2086</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19142,7 +19137,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12769</v>
+                                    <v>12770</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -19167,17 +19162,17 @@
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>5850</v>
+                                    <v>5860</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>52</b>
-                                    <v>5409</v>
+                                    <v>5399</v>
                                 </b>
                                 <b>
                                     <a>52</a>
                                     <b>4358</b>
-                                    <v>3742</v>
+                                    <v>3743</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19187,11 +19182,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2998534</cardinality>
+            <cardinality>2998626</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1422055</v>
+                    <v>1422098</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19199,7 +19194,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>844136</v>
+                    <v>844162</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19213,27 +19208,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599054</v>
+                                    <v>599073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>433884</v>
+                                    <v>433897</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>263356</v>
+                                    <v>263364</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>107663</v>
+                                    <v>107667</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>113</b>
-                                    <v>18095</v>
+                                    <v>18096</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19249,22 +19244,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>627907</v>
+                                    <v>627926</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>448038</v>
+                                    <v>448051</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>263419</v>
+                                    <v>263427</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>82690</v>
+                                    <v>82692</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19372,22 +19367,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>523955</v>
+                                    <v>523971</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>174574</v>
+                                    <v>174580</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>77678</v>
+                                    <v>77680</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>44</b>
-                                    <v>63440</v>
+                                    <v>63442</v>
                                 </b>
                                 <b>
                                     <a>44</a>
@@ -19408,12 +19403,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>737060</v>
+                                    <v>737082</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>87806</v>
+                                    <v>87809</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -19428,11 +19423,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>508345</cardinality>
+            <cardinality>508368</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>208910</v>
+                    <v>208919</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19440,7 +19435,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>508211</v>
+                    <v>508234</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19454,17 +19449,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>159691</v>
+                                    <v>159699</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42680</v>
+                                    <v>42682</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>6537</v>
+                                    <v>6538</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19480,12 +19475,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>151947</v>
+                                    <v>151953</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>39830</v>
+                                    <v>39832</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -19623,7 +19618,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>508077</v>
+                                    <v>508100</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19644,7 +19639,95 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>508211</v>
+                                    <v>508234</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>class_template_generated_from</name>
+            <cardinality>61398</cardinality>
+            <columnsizes>
+                <e>
+                    <k>template</k>
+                    <v>61398</v>
+                </e>
+                <e>
+                    <k>from</k>
+                    <v>3732</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>template</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>61398</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>template</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1509</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>471</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>209</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>178</v>
+                                </b>
+                                <b>
+                                    <a>6</a>
+                                    <b>7</b>
+                                    <v>262</v>
+                                </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>10</b>
+                                    <v>262</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>16</b>
+                                    <v>283</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>63</b>
+                                    <v>335</v>
+                                </b>
+                                <b>
+                                    <a>63</a>
+                                    <b>603</b>
+                                    <v>220</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19654,15 +19737,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>50199</cardinality>
+            <cardinality>50200</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>50199</v>
+                    <v>50200</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>46896</v>
+                    <v>46897</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19676,7 +19759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50199</v>
+                                    <v>50200</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19692,7 +19775,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46141</v>
+                                    <v>46143</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19719,7 +19802,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5858727</v>
+                    <v>5858726</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -19903,7 +19986,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5813023</v>
+                                    <v>5813022</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19924,7 +20007,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5813023</v>
+                                    <v>5813022</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19945,7 +20028,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5858727</v>
+                                    <v>5858726</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20014,15 +20097,15 @@
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>958487</cardinality>
+            <cardinality>958530</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>958487</v>
+                    <v>958530</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>179842</v>
+                    <v>179850</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20036,7 +20119,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>958487</v>
+                                    <v>958530</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20052,22 +20135,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>108830</v>
+                                    <v>108835</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42144</v>
+                                    <v>42146</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>14215</v>
+                                    <v>14216</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>104</b>
-                                    <v>13511</v>
+                                    <v>13512</v>
                                 </b>
                                 <b>
                                     <a>119</a>
@@ -20082,11 +20165,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2445838</cardinality>
+            <cardinality>2445949</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1430522</v>
+                    <v>1430587</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20094,7 +20177,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>293265</v>
+                    <v>293279</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20108,22 +20191,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>770766</v>
+                                    <v>770800</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406656</v>
+                                    <v>406674</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>169146</v>
+                                    <v>169154</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>83953</v>
+                                    <v>83956</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20139,22 +20222,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>789608</v>
+                                    <v>789644</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>404778</v>
+                                    <v>404797</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>167001</v>
+                                    <v>167008</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>69133</v>
+                                    <v>69137</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20292,12 +20375,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171996</v>
+                                    <v>172004</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>25883</v>
+                                    <v>25884</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20307,17 +20390,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>22429</v>
+                                    <v>22430</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>22932</v>
+                                    <v>22933</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>76</b>
-                                    <v>22999</v>
+                                    <v>23000</v>
                                 </b>
                                 <b>
                                     <a>79</a>
@@ -20338,12 +20421,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>252697</v>
+                                    <v>252708</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31650</v>
+                                    <v>31651</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20358,11 +20441,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>445548</cardinality>
+            <cardinality>445568</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>193655</v>
+                    <v>193664</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20370,7 +20453,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>442899</v>
+                    <v>442919</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20384,12 +20467,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148996</v>
+                                    <v>149003</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42211</v>
+                                    <v>42213</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20410,12 +20493,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>142190</v>
+                                    <v>142197</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36109</v>
+                                    <v>36110</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20563,7 +20646,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>440251</v>
+                                    <v>440270</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20584,7 +20667,110 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>442899</v>
+                                    <v>442919</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>function_template_generated_from</name>
+            <cardinality>863408</cardinality>
+            <columnsizes>
+                <e>
+                    <k>template</k>
+                    <v>863408</v>
+                </e>
+                <e>
+                    <k>from</k>
+                    <v>22129</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>template</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>863408</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>template</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>3587</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>1173</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>5</b>
+                                    <v>1676</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>8</b>
+                                    <v>1777</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>14</b>
+                                    <v>1676</v>
+                                </b>
+                                <b>
+                                    <a>16</a>
+                                    <b>20</b>
+                                    <v>1575</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>23</b>
+                                    <v>1676</v>
+                                </b>
+                                <b>
+                                    <a>23</a>
+                                    <b>32</b>
+                                    <v>1844</v>
+                                </b>
+                                <b>
+                                    <a>33</a>
+                                    <b>66</b>
+                                    <v>2045</v>
+                                </b>
+                                <b>
+                                    <a>70</a>
+                                    <b>79</b>
+                                    <v>1374</v>
+                                </b>
+                                <b>
+                                    <a>83</a>
+                                    <b>110</b>
+                                    <v>1844</v>
+                                </b>
+                                <b>
+                                    <a>111</a>
+                                    <b>370</b>
+                                    <v>1877</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21088,28 +21274,76 @@
                 </dep>
             </dependencies>
         </relation>
+        <relation>
+            <name>variable_template_generated_from</name>
+            <cardinality>492</cardinality>
+            <columnsizes>
+                <e>
+                    <k>template</k>
+                    <v>492</v>
+                </e>
+                <e>
+                    <k>from</k>
+                    <v>246</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>template</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>492</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>template</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>246</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
         <relation>
             <name>is_alias_template</name>
-            <cardinality>107388</cardinality>
+            <cardinality>107393</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>107388</v>
+                    <v>107393</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>alias_instantiation</name>
-            <cardinality>459629</cardinality>
+            <cardinality>459650</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>459629</v>
+                    <v>459650</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>92200</v>
+                    <v>92205</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21123,7 +21357,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>459629</v>
+                                    <v>459650</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21144,12 +21378,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16797</v>
+                                    <v>16798</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20015</v>
+                                    <v>20016</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -21169,7 +21403,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>10</b>
-                                    <v>7811</v>
+                                    <v>7812</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -21189,11 +21423,11 @@
         </relation>
         <relation>
             <name>alias_template_argument</name>
-            <cardinality>993020</cardinality>
+            <cardinality>993065</cardinality>
             <columnsizes>
                 <e>
-                    <k>variable_id</k>
-                    <v>566951</v>
+                    <k>type_id</k>
+                    <v>566977</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -21201,12 +21435,12 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>127706</v>
+                    <v>127712</v>
                 </e>
             </columnsizes>
             <dependencies>
                 <dep>
-                    <src>variable_id</src>
+                    <src>type_id</src>
                     <trg>index</trg>
                     <val>
                         <hist>
@@ -21215,29 +21449,29 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>276166</v>
+                                    <v>276179</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>182323</v>
+                                    <v>182331</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>86903</v>
+                                    <v>86907</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>21558</v>
+                                    <v>21559</v>
                                 </b>
                             </bs>
                         </hist>
                     </val>
                 </dep>
                 <dep>
-                    <src>variable_id</src>
+                    <src>type_id</src>
                     <trg>arg_type</trg>
                     <val>
                         <hist>
@@ -21246,17 +21480,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>277407</v>
+                                    <v>277419</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>181116</v>
+                                    <v>181124</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>88345</v>
+                                    <v>88349</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -21269,7 +21503,7 @@
                 </dep>
                 <dep>
                     <src>index</src>
-                    <trg>variable_id</trg>
+                    <trg>type_id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -21381,7 +21615,7 @@
                 </dep>
                 <dep>
                     <src>arg_type</src>
-                    <trg>variable_id</trg>
+                    <trg>type_id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -21389,12 +21623,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>78152</v>
+                                    <v>78156</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20284</v>
+                                    <v>20285</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21404,7 +21638,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>10460</v>
+                                    <v>10461</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -21430,12 +21664,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>108797</v>
+                                    <v>108801</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17300</v>
+                                    <v>17301</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21450,11 +21684,11 @@
         </relation>
         <relation>
             <name>alias_template_argument_value</name>
-            <cardinality>173170</cardinality>
+            <cardinality>173177</cardinality>
             <columnsizes>
                 <e>
-                    <k>variable_id</k>
-                    <v>160597</v>
+                    <k>type_id</k>
+                    <v>160604</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -21462,12 +21696,12 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>173170</v>
+                    <v>173177</v>
                 </e>
             </columnsizes>
             <dependencies>
                 <dep>
-                    <src>variable_id</src>
+                    <src>type_id</src>
                     <trg>index</trg>
                     <val>
                         <hist>
@@ -21476,7 +21710,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>159356</v>
+                                    <v>159363</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21488,7 +21722,7 @@
                     </val>
                 </dep>
                 <dep>
-                    <src>variable_id</src>
+                    <src>type_id</src>
                     <trg>arg_value</trg>
                     <val>
                         <hist>
@@ -21497,7 +21731,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>158686</v>
+                                    <v>158693</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21510,7 +21744,7 @@
                 </dep>
                 <dep>
                     <src>index</src>
-                    <trg>variable_id</trg>
+                    <trg>type_id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -21572,7 +21806,7 @@
                 </dep>
                 <dep>
                     <src>arg_value</src>
-                    <trg>variable_id</trg>
+                    <trg>type_id</trg>
                     <val>
                         <hist>
                             <budget>12</budget>
@@ -21580,7 +21814,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173170</v>
+                                    <v>173177</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21596,7 +21830,115 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173170</v>
+                                    <v>173177</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>alias_template_generated_from</name>
+            <cardinality>99816</cardinality>
+            <columnsizes>
+                <e>
+                    <k>template</k>
+                    <v>99816</v>
+                </e>
+                <e>
+                    <k>from</k>
+                    <v>1911</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>template</src>
+                    <trg>from</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>99816</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>from</src>
+                    <trg>template</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>134</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>4</b>
+                                    <v>134</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>8</b>
+                                    <v>134</v>
+                                </b>
+                                <b>
+                                    <a>9</a>
+                                    <b>18</b>
+                                    <v>167</v>
+                                </b>
+                                <b>
+                                    <a>18</a>
+                                    <b>20</b>
+                                    <v>134</v>
+                                </b>
+                                <b>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>201</v>
+                                </b>
+                                <b>
+                                    <a>31</a>
+                                    <b>32</b>
+                                    <v>134</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>50</b>
+                                    <v>134</v>
+                                </b>
+                                <b>
+                                    <a>64</a>
+                                    <b>65</b>
+                                    <v>67</v>
+                                </b>
+                                <b>
+                                    <a>65</a>
+                                    <b>66</b>
+                                    <v>134</v>
+                                </b>
+                                <b>
+                                    <a>74</a>
+                                    <b>84</b>
+                                    <v>167</v>
+                                </b>
+                                <b>
+                                    <a>111</a>
+                                    <b>112</b>
+                                    <v>268</v>
+                                </b>
+                                <b>
+                                    <a>150</a>
+                                    <b>294</b>
+                                    <v>100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22270,22 +22612,22 @@
         </relation>
         <relation>
             <name>is_type_constraint</name>
-            <cardinality>36672</cardinality>
+            <cardinality>36673</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>36672</v>
+                    <v>36673</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>concept_template_argument</name>
-            <cardinality>112670</cardinality>
+            <cardinality>112671</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>76125</v>
+                    <v>76126</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22307,7 +22649,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46316</v>
+                                    <v>46317</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22643,15 +22985,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>594947</cardinality>
+            <cardinality>594974</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>594947</v>
+                    <v>594974</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>279385</v>
+                    <v>279398</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22665,7 +23007,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>594947</v>
+                                    <v>594974</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22681,12 +23023,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230401</v>
+                                    <v>230412</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34667</v>
+                                    <v>34669</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -23125,7 +23467,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7705</v>
+                                    <v>7706</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23146,7 +23488,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7705</v>
+                                    <v>7706</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23271,11 +23613,11 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>849756</cardinality>
+            <cardinality>849782</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>844650</v>
+                    <v>844676</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -23293,12 +23635,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>839544</v>
+                                    <v>839570</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5105</v>
+                                    <v>5106</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23522,7 +23864,7 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>3216567</cardinality>
+            <cardinality>3216566</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
@@ -24764,11 +25106,11 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>16428</cardinality>
+            <cardinality>16429</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>16428</v>
+                    <v>16429</v>
                 </e>
                 <e>
                     <k>value</k>
@@ -24786,7 +25128,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16428</v>
+                                    <v>16429</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24920,15 +25262,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>71325</cardinality>
+            <cardinality>71243</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>71325</v>
+                    <v>71243</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>71325</v>
+                    <v>71243</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24942,7 +25284,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71325</v>
+                                    <v>71243</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24958,7 +25300,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71325</v>
+                                    <v>71243</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25253,7 +25595,7 @@
         </relation>
         <relation>
             <name>namespaceattributes</name>
-            <cardinality>5900</cardinality>
+            <cardinality>5901</cardinality>
             <columnsizes>
                 <e>
                     <k>namespace_id</k>
@@ -25261,7 +25603,7 @@
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>5900</v>
+                    <v>5901</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25301,7 +25643,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5900</v>
+                                    <v>5901</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25379,11 +25721,11 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>7381948</cardinality>
+            <cardinality>7381947</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>7381948</v>
+                    <v>7381947</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
@@ -25401,7 +25743,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7381948</v>
+                                    <v>7381947</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25442,7 +25784,7 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4133758</cardinality>
+            <cardinality>4133757</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -25763,15 +26105,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>114593</cardinality>
+            <cardinality>114597</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>114593</v>
+                    <v>114597</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>68861</v>
+                    <v>68863</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25785,7 +26127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>114593</v>
+                                    <v>114597</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25801,7 +26143,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37345</v>
+                                    <v>37346</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25811,7 +26153,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>6038</v>
+                                    <v>6039</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -25826,15 +26168,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>491380</cardinality>
+            <cardinality>491402</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>491380</v>
+                    <v>491402</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>469990</v>
+                    <v>470011</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25842,11 +26184,11 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>238951</v>
+                    <v>238962</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>34835</v>
+                    <v>34836</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25860,7 +26202,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>491380</v>
+                                    <v>491402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25876,7 +26218,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>491380</v>
+                                    <v>491402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25892,7 +26234,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>491380</v>
+                                    <v>491402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25908,7 +26250,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>491380</v>
+                                    <v>491402</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25924,12 +26266,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>453729</v>
+                                    <v>453749</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>16260</v>
+                                    <v>16261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25945,12 +26287,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>453729</v>
+                                    <v>453749</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>16260</v>
+                                    <v>16261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25966,12 +26308,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>453729</v>
+                                    <v>453749</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>16260</v>
+                                    <v>16261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25987,12 +26329,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>453729</v>
+                                    <v>453749</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>16260</v>
+                                    <v>16261</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26147,7 +26489,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>229194</v>
+                                    <v>229205</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26168,7 +26510,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>229194</v>
+                                    <v>229205</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26189,7 +26531,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>238515</v>
+                                    <v>238526</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26210,7 +26552,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>233586</v>
+                                    <v>233597</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26231,7 +26573,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25849</v>
+                                    <v>25850</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26267,7 +26609,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25849</v>
+                                    <v>25850</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26303,7 +26645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34835</v>
+                                    <v>34836</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26319,7 +26661,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28163</v>
+                                    <v>28164</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26344,11 +26686,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>493124</cardinality>
+            <cardinality>493146</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>490944</v>
+                    <v>490966</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -26366,7 +26708,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>488765</v>
+                                    <v>488787</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26412,11 +26754,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>464893</cardinality>
+            <cardinality>464914</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>464893</v>
+                    <v>464914</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -26434,7 +26776,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>464893</v>
+                                    <v>464914</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26631,19 +26973,19 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>760573</cardinality>
+            <cardinality>759702</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>760573</v>
+                    <v>759702</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53845</v>
+                    <v>53847</v>
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>99677</v>
+                    <v>99782</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -26661,7 +27003,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>760573</v>
+                                    <v>759702</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26677,7 +27019,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>760573</v>
+                                    <v>759702</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26693,7 +27035,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>760573</v>
+                                    <v>759702</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26714,17 +27056,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24743</v>
+                                    <v>24778</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4760</v>
+                                    <v>4794</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>17</b>
-                                    <v>4693</v>
+                                    <v>4627</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -26739,7 +27081,7 @@
                                 <b>
                                     <a>45</a>
                                     <b>81</b>
-                                    <v>4693</v>
+                                    <v>4694</v>
                                 </b>
                                 <b>
                                     <a>102</a>
@@ -26765,17 +27107,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24743</v>
+                                    <v>24778</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4760</v>
+                                    <v>4794</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>17</b>
-                                    <v>4693</v>
+                                    <v>4627</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -26790,7 +27132,7 @@
                                 <b>
                                     <a>45</a>
                                     <b>81</b>
-                                    <v>4693</v>
+                                    <v>4694</v>
                                 </b>
                                 <b>
                                     <a>102</a>
@@ -26811,7 +27153,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52504</v>
+                                    <v>52506</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26832,12 +27174,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>66652</v>
+                                    <v>66890</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8180</v>
+                                    <v>8046</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26847,17 +27189,17 @@
                                 <b>
                                     <a>9</a>
                                     <b>24</b>
-                                    <v>7543</v>
+                                    <v>7544</v>
                                 </b>
                                 <b>
                                     <a>24</a>
-                                    <b>127</b>
-                                    <v>7476</v>
+                                    <b>134</b>
+                                    <v>7544</v>
                                 </b>
                                 <b>
                                     <a>135</a>
                                     <b>191</b>
-                                    <v>704</v>
+                                    <v>637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26873,12 +27215,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>66652</v>
+                                    <v>66890</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8180</v>
+                                    <v>8046</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26888,17 +27230,17 @@
                                 <b>
                                     <a>9</a>
                                     <b>24</b>
-                                    <v>7543</v>
+                                    <v>7544</v>
                                 </b>
                                 <b>
                                     <a>24</a>
-                                    <b>127</b>
-                                    <v>7476</v>
+                                    <b>134</b>
+                                    <v>7544</v>
                                 </b>
                                 <b>
                                     <a>135</a>
                                     <b>191</b>
-                                    <v>704</v>
+                                    <v>637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26914,12 +27256,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>98470</v>
+                                    <v>98575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>1206</v>
+                                    <v>1207</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26939,7 +27281,7 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>22496</b>
+                                    <b>22469</b>
                                     <v>368</v>
                                 </b>
                             </bs>
@@ -26981,7 +27323,7 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>2841</b>
+                                    <b>2844</b>
                                     <v>335</v>
                                 </b>
                             </bs>
@@ -27000,7 +27342,7 @@
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>4246592</v>
+                    <v>4246591</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -27190,7 +27532,7 @@
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9636898</v>
+                    <v>9636897</v>
                 </e>
                 <e>
                     <k>conversion</k>
@@ -27239,22 +27581,22 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>9885829</cardinality>
+            <cardinality>9885625</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9885829</v>
+                    <v>9885625</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1661380</cardinality>
+            <cardinality>1661392</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>1237278</v>
+                    <v>1237287</v>
                 </e>
                 <e>
                     <k>i</k>
@@ -27262,7 +27604,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1661380</v>
+                    <v>1661392</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27276,12 +27618,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>823569</v>
+                                    <v>823575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406951</v>
+                                    <v>406955</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27302,12 +27644,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>823569</v>
+                                    <v>823575</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406951</v>
+                                    <v>406955</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27460,7 +27802,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1661380</v>
+                                    <v>1661392</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27476,7 +27818,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1661380</v>
+                                    <v>1661392</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27663,11 +28005,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19462196</cardinality>
+            <cardinality>19462195</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19462196</v>
+                    <v>19462195</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -27675,7 +28017,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12945305</v>
+                    <v>12945304</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27689,7 +28031,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19462196</v>
+                                    <v>19462195</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27705,7 +28047,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19462196</v>
+                                    <v>19462195</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27869,22 +28211,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6919046</cardinality>
+            <cardinality>6919045</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6919046</v>
+                    <v>6919045</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>6052845</cardinality>
+            <cardinality>6052846</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6052845</v>
+                    <v>6052846</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27902,7 +28244,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6052845</v>
+                                    <v>6052846</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27946,8 +28288,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5833723</a>
-                                    <b>5833724</b>
+                                    <a>5833724</a>
+                                    <b>5833725</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -27958,11 +28300,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>5772683</cardinality>
+            <cardinality>5772727</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>5772683</v>
+                    <v>5772727</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27980,7 +28322,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5772683</v>
+                                    <v>5772727</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28147,15 +28489,15 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>3051466</cardinality>
+            <cardinality>3051489</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3051466</v>
+                    <v>3051489</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>3051466</v>
+                    <v>3051489</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
@@ -28163,7 +28505,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>558946</v>
+                    <v>558951</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28177,7 +28519,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3051466</v>
+                                    <v>3051489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28193,7 +28535,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3051466</v>
+                                    <v>3051489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28209,7 +28551,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3051466</v>
+                                    <v>3051489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28225,7 +28567,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3051466</v>
+                                    <v>3051489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28241,7 +28583,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3051466</v>
+                                    <v>3051489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28257,7 +28599,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3051466</v>
+                                    <v>3051489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28376,7 +28718,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83267</v>
+                                    <v>83268</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28386,7 +28728,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>396709</v>
+                                    <v>396712</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -28407,7 +28749,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>83267</v>
+                                    <v>83268</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28417,7 +28759,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>396709</v>
+                                    <v>396712</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -28438,7 +28780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>119491</v>
+                                    <v>119492</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28448,7 +28790,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>412918</v>
+                                    <v>412921</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -28629,11 +28971,11 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>44755</cardinality>
+            <cardinality>44756</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>44755</v>
+                    <v>44756</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -28655,7 +28997,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44755</v>
+                                    <v>44756</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28671,7 +29013,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44755</v>
+                                    <v>44756</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28755,11 +29097,11 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>52973</cardinality>
+            <cardinality>52976</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>52973</v>
+                    <v>52976</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -28781,7 +29123,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52973</v>
+                                    <v>52976</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28797,7 +29139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52973</v>
+                                    <v>52976</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29046,11 +29388,11 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>13547188</cardinality>
+            <cardinality>13547187</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13547188</v>
+                    <v>13547187</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -29068,7 +29410,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13547188</v>
+                                    <v>13547187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29114,11 +29456,11 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>6648792</cardinality>
+            <cardinality>6648929</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6648792</v>
+                    <v>6648929</v>
                 </e>
                 <e>
                     <k>text</k>
@@ -29136,7 +29478,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6648792</v>
+                                    <v>6648929</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29181,7 +29523,7 @@
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>13547188</v>
+                    <v>13547187</v>
                 </e>
                 <e>
                     <k>expr</k>
@@ -29199,7 +29541,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13456978</v>
+                                    <v>13456977</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29622,11 +29964,11 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>2245055</cardinality>
+            <cardinality>2245054</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>2245055</v>
+                    <v>2245054</v>
                 </e>
                 <e>
                     <k>var</k>
@@ -29634,7 +29976,7 @@
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>2245055</v>
+                    <v>2245054</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -29652,7 +29994,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2245055</v>
+                                    <v>2245054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29668,7 +30010,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2245055</v>
+                                    <v>2245054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29684,7 +30026,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2245055</v>
+                                    <v>2245054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29773,7 +30115,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2245055</v>
+                                    <v>2245054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29789,7 +30131,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2245055</v>
+                                    <v>2245054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29805,7 +30147,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2245055</v>
+                                    <v>2245054</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29903,26 +30245,26 @@
         </relation>
         <relation>
             <name>braced_initialisers</name>
-            <cardinality>67172</cardinality>
+            <cardinality>67182</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>67172</v>
+                    <v>67182</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>1667324</cardinality>
+            <cardinality>1667337</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>1667324</v>
+                    <v>1667337</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>834475</v>
+                    <v>834481</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29936,7 +30278,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1667324</v>
+                                    <v>1667337</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29957,7 +30299,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>807488</v>
+                                    <v>807494</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -29972,11 +30314,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25220908</cardinality>
+            <cardinality>25220907</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25220908</v>
+                    <v>25220907</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -29998,7 +30340,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25220908</v>
+                                    <v>25220907</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30014,7 +30356,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25220908</v>
+                                    <v>25220907</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30243,15 +30585,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>841809</cardinality>
+            <cardinality>841815</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>841809</v>
+                    <v>841815</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>841809</v>
+                    <v>841815</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -30269,7 +30611,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>841809</v>
+                                    <v>841815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30285,7 +30627,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>841809</v>
+                                    <v>841815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30301,7 +30643,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>841809</v>
+                                    <v>841815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30317,7 +30659,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>841809</v>
+                                    <v>841815</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30369,11 +30711,11 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25220908</cardinality>
+            <cardinality>25220907</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25220908</v>
+                    <v>25220907</v>
                 </e>
                 <e>
                     <k>typeid</k>
@@ -30395,7 +30737,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25220908</v>
+                                    <v>25220907</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30411,7 +30753,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25220908</v>
+                                    <v>25220907</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30672,11 +31014,11 @@
         </relation>
         <relation>
             <name>param_ref_to_this</name>
-            <cardinality>24978</cardinality>
+            <cardinality>24973</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>24978</v>
+                    <v>24973</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -32019,15 +32361,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>406396</cardinality>
+            <cardinality>406399</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>406396</v>
+                    <v>406399</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>406396</v>
+                    <v>406399</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32041,7 +32383,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406396</v>
+                                    <v>406399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32057,7 +32399,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406396</v>
+                                    <v>406399</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32067,15 +32409,15 @@
         </relation>
         <relation>
             <name>typeid_bind</name>
-            <cardinality>47139</cardinality>
+            <cardinality>47141</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>47139</v>
+                    <v>47141</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>15690</v>
+                    <v>15691</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32089,7 +32431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47139</v>
+                                    <v>47141</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32105,12 +32447,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2916</v>
+                                    <v>2917</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12371</v>
+                                    <v>12372</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -33911,7 +34253,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2675420</v>
+                    <v>2675419</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34428,15 +34770,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>434387</cardinality>
+            <cardinality>434390</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>434387</v>
+                    <v>434390</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>434387</v>
+                    <v>434390</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34450,7 +34792,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>434387</v>
+                                    <v>434390</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34466,7 +34808,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>434387</v>
+                                    <v>434390</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34860,11 +35202,11 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>830946</cardinality>
+            <cardinality>830953</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>409304</v>
+                    <v>409307</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -34872,7 +35214,7 @@
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>830946</v>
+                    <v>830953</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34891,7 +35233,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406438</v>
+                                    <v>406441</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34917,7 +35259,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406438</v>
+                                    <v>406441</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -35080,7 +35422,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>830946</v>
+                                    <v>830953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35096,7 +35438,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>830946</v>
+                                    <v>830953</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35106,15 +35448,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>409304</cardinality>
+            <cardinality>409307</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>409304</v>
+                    <v>409307</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>409304</v>
+                    <v>409307</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35128,7 +35470,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409304</v>
+                                    <v>409307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35144,7 +35486,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409304</v>
+                                    <v>409307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35602,11 +35944,11 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>43026</cardinality>
+            <cardinality>43039</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>43026</v>
+                    <v>43039</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -35617,7 +35959,7 @@
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>712863</v>
+                    <v>712862</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -35823,7 +36165,7 @@
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>712863</v>
+                    <v>712862</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -36264,11 +36606,11 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5334449</cardinality>
+            <cardinality>5334448</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5334449</v>
+                    <v>5334448</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -36290,7 +36632,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5334449</v>
+                                    <v>5334448</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36306,7 +36648,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5334449</v>
+                                    <v>5334448</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36711,15 +37053,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>316281</cardinality>
+            <cardinality>316291</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>316281</v>
+                    <v>316291</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>58261</v>
+                    <v>58263</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36733,7 +37075,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>316281</v>
+                                    <v>316291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36749,7 +37091,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28831</v>
+                                    <v>28832</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36774,7 +37116,7 @@
                                 <b>
                                     <a>11</a>
                                     <b>47</b>
-                                    <v>4371</v>
+                                    <v>4372</v>
                                 </b>
                                 <b>
                                     <a>47</a>
@@ -36885,11 +37227,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>30702235</cardinality>
+            <cardinality>30703622</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3901138</v>
+                    <v>3901314</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -36907,17 +37249,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>531747</v>
+                                    <v>531771</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>26989</v>
+                                    <v>26990</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3342400</v>
+                                    <v>3342551</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/old.dbscheme b/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/old.dbscheme
new file mode 100644
index 00000000000..837c4e02326
--- /dev/null
+++ b/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/old.dbscheme
@@ -0,0 +1,2561 @@
+
+/*- 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
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_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 -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file 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
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // 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
+);
+
+builtin_functions(
+    int id: @function 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
+// ... 41 _Decimal64
+// ... 42 _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
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int variable_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int variable_id: @usertype 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
+                       | @decltype;
+
+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
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@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
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+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
+);
+
+param_ref_to_this(
+    int expr: @param_ref 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
+| 17 = @ppd_embed
+| 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
+);
+
+embeds(
+    unique int id: @ppd_embed 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
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string 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/837c4e02326aee4582405d069263092e80a15d82/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/semmlecode.cpp.dbscheme
new file mode 100644
index 00000000000..ef8d209a22e
--- /dev/null
+++ b/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/semmlecode.cpp.dbscheme
@@ -0,0 +1,2577 @@
+
+/*- 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
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_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 -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file 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
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // 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
+);
+
+builtin_functions(
+    int id: @function 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
+// ... 41 _Decimal64
+// ... 42 _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
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype 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
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function 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
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype 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
+                       | @decltype;
+
+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
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@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
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+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
+);
+
+param_ref_to_this(
+    int expr: @param_ref 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
+| 17 = @ppd_embed
+| 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
+);
+
+embeds(
+    unique int id: @ppd_embed 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
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string 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/837c4e02326aee4582405d069263092e80a15d82/upgrade.properties b/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/upgrade.properties
new file mode 100644
index 00000000000..4cda5136f03
--- /dev/null
+++ b/cpp/ql/lib/upgrades/837c4e02326aee4582405d069263092e80a15d82/upgrade.properties
@@ -0,0 +1,2 @@
+description: Capture information about one template being generated from another
+compatibility: backwards
diff --git a/cpp/ql/src/CHANGELOG.md b/cpp/ql/src/CHANGELOG.md
index 3a9d4fae927..901d2092283 100644
--- a/cpp/ql/src/CHANGELOG.md
+++ b/cpp/ql/src/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.6.3
+
+### Minor Analysis Improvements
+
+* The 'Cleartext transmission of sensitive information' query (`cpp/cleartext-transmission`) no longer raises an alert on calls to `fscanf` (and variants) when the call reads from an "obviously local" `FILE` stream such as `stdin`.
+
 ## 1.6.2
 
 No user-facing changes.
diff --git a/cpp/ql/src/change-notes/2026-05-15-cleartext-transmission-fp.md b/cpp/ql/src/change-notes/released/1.6.3.md
similarity index 69%
rename from cpp/ql/src/change-notes/2026-05-15-cleartext-transmission-fp.md
rename to cpp/ql/src/change-notes/released/1.6.3.md
index 6fcb3e1c88b..bd2b7c9bdb1 100644
--- a/cpp/ql/src/change-notes/2026-05-15-cleartext-transmission-fp.md
+++ b/cpp/ql/src/change-notes/released/1.6.3.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
-* The 'Cleartext transmission of sensitive information' query (`cpp/cleartext-transmission`) no longer raises an alert on calls to `fscanf` (and variants) when the call reads from an "obviously local" `FILE` stream such as `stdin`.
\ No newline at end of file
+## 1.6.3
+
+### Minor Analysis Improvements
+
+* The 'Cleartext transmission of sensitive information' query (`cpp/cleartext-transmission`) no longer raises an alert on calls to `fscanf` (and variants) when the call reads from an "obviously local" `FILE` stream such as `stdin`.
diff --git a/cpp/ql/src/codeql-pack.release.yml b/cpp/ql/src/codeql-pack.release.yml
index 5f5beb68311..00b51441d88 100644
--- a/cpp/ql/src/codeql-pack.release.yml
+++ b/cpp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.6.2
+lastReleaseVersion: 1.6.3
diff --git a/cpp/ql/src/qlpack.yml b/cpp/ql/src/qlpack.yml
index ddd0014f2e0..74055b4cf11 100644
--- a/cpp/ql/src/qlpack.yml
+++ b/cpp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/cpp-queries
-version: 1.6.3-dev
+version: 1.6.4-dev
 groups:
   - cpp
   - queries
diff --git a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs
index 2c74775460d..dd82f707727 100644
--- a/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs
+++ b/csharp/extractor/Semmle.Extraction.CSharp/Entities/Compilations/Compilation.cs
@@ -32,9 +32,13 @@ namespace Semmle.Extraction.CSharp.Entities
         {
             var assembly = Assembly.CreateOutputAssembly(Context);
 
-            trapFile.compilations(this, FileUtils.ConvertToUnix(cwd));
+            var path = Context.ExtractionContext.PathTransformer.Transform(cwd);
+            trapFile.compilations(this, path.Value);
             trapFile.compilation_assembly(this, assembly);
 
+            // Ensure that a `Folder` entity exists
+            Folder.Create(Context, path);
+
             // Arguments
             var expandedIndex = 0;
             for (var i = 0; i < args.Length; i++)
diff --git a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
index 4cb7b556968..eefb35f174a 100644
--- a/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.67
+
+No user-facing changes.
+
 ## 1.7.66
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.67.md b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.67.md
new file mode 100644
index 00000000000..6ae3bdfde83
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/lib/change-notes/released/1.7.67.md
@@ -0,0 +1,3 @@
+## 1.7.67
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
index 7d0a2c0bc07..0293fdade8f 100644
--- a/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.66
+lastReleaseVersion: 1.7.67
diff --git a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
index c5cfa0dcd89..659dd5b0038 100644
--- a/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-all
-version: 1.7.67-dev
+version: 1.7.68-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
index 4cb7b556968..eefb35f174a 100644
--- a/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
+++ b/csharp/ql/campaigns/Solorigate/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.67
+
+No user-facing changes.
+
 ## 1.7.66
 
 No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.67.md b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.67.md
new file mode 100644
index 00000000000..6ae3bdfde83
--- /dev/null
+++ b/csharp/ql/campaigns/Solorigate/src/change-notes/released/1.7.67.md
@@ -0,0 +1,3 @@
+## 1.7.67
+
+No user-facing changes.
diff --git a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
index 7d0a2c0bc07..0293fdade8f 100644
--- a/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
+++ b/csharp/ql/campaigns/Solorigate/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.66
+lastReleaseVersion: 1.7.67
diff --git a/csharp/ql/campaigns/Solorigate/src/qlpack.yml b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
index c9f0acac983..c7f243d86f0 100644
--- a/csharp/ql/campaigns/Solorigate/src/qlpack.yml
+++ b/csharp/ql/campaigns/Solorigate/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-solorigate-queries
-version: 1.7.67-dev
+version: 1.7.68-dev
 groups:
   - csharp
   - solorigate
diff --git a/csharp/ql/lib/CHANGELOG.md b/csharp/ql/lib/CHANGELOG.md
index 1d7f42a9075..17fd83bcda7 100644
--- a/csharp/ql/lib/CHANGELOG.md
+++ b/csharp/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 6.0.1
+
+No user-facing changes.
+
 ## 6.0.0
 
 ### Breaking Changes
diff --git a/csharp/ql/lib/change-notes/released/6.0.1.md b/csharp/ql/lib/change-notes/released/6.0.1.md
new file mode 100644
index 00000000000..35b17912c81
--- /dev/null
+++ b/csharp/ql/lib/change-notes/released/6.0.1.md
@@ -0,0 +1,3 @@
+## 6.0.1
+
+No user-facing changes.
diff --git a/csharp/ql/lib/codeql-pack.release.yml b/csharp/ql/lib/codeql-pack.release.yml
index f8c4fa43ccb..d1f3c68c812 100644
--- a/csharp/ql/lib/codeql-pack.release.yml
+++ b/csharp/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 6.0.0
+lastReleaseVersion: 6.0.1
diff --git a/csharp/ql/lib/qlpack.yml b/csharp/ql/lib/qlpack.yml
index 0e03db99ca9..b3a0dab7303 100644
--- a/csharp/ql/lib/qlpack.yml
+++ b/csharp/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-all
-version: 6.0.1-dev
+version: 6.0.2-dev
 groups: csharp
 dbscheme: semmlecode.csharp.dbscheme
 extractor: csharp
diff --git a/csharp/ql/src/CHANGELOG.md b/csharp/ql/src/CHANGELOG.md
index 32243acfb97..8c4388fe2bb 100644
--- a/csharp/ql/src/CHANGELOG.md
+++ b/csharp/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.7.3
+
+No user-facing changes.
+
 ## 1.7.2
 
 No user-facing changes.
diff --git a/csharp/ql/src/change-notes/released/1.7.3.md b/csharp/ql/src/change-notes/released/1.7.3.md
new file mode 100644
index 00000000000..a629082e215
--- /dev/null
+++ b/csharp/ql/src/change-notes/released/1.7.3.md
@@ -0,0 +1,3 @@
+## 1.7.3
+
+No user-facing changes.
diff --git a/csharp/ql/src/codeql-pack.release.yml b/csharp/ql/src/codeql-pack.release.yml
index 39bbba86c19..9f9661b1e77 100644
--- a/csharp/ql/src/codeql-pack.release.yml
+++ b/csharp/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.7.2
+lastReleaseVersion: 1.7.3
diff --git a/csharp/ql/src/qlpack.yml b/csharp/ql/src/qlpack.yml
index de201743065..bfb1852bacb 100644
--- a/csharp/ql/src/qlpack.yml
+++ b/csharp/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/csharp-queries
-version: 1.7.3-dev
+version: 1.7.4-dev
 groups:
   - csharp
   - queries
diff --git a/go/ql/consistency-queries/CHANGELOG.md b/go/ql/consistency-queries/CHANGELOG.md
index a6b6055373a..512a5732ccd 100644
--- a/go/ql/consistency-queries/CHANGELOG.md
+++ b/go/ql/consistency-queries/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.50
+
+No user-facing changes.
+
 ## 1.0.49
 
 No user-facing changes.
diff --git a/go/ql/consistency-queries/change-notes/released/1.0.50.md b/go/ql/consistency-queries/change-notes/released/1.0.50.md
new file mode 100644
index 00000000000..c1e5becd9fc
--- /dev/null
+++ b/go/ql/consistency-queries/change-notes/released/1.0.50.md
@@ -0,0 +1,3 @@
+## 1.0.50
+
+No user-facing changes.
diff --git a/go/ql/consistency-queries/codeql-pack.release.yml b/go/ql/consistency-queries/codeql-pack.release.yml
index 596617977df..856137cc5db 100644
--- a/go/ql/consistency-queries/codeql-pack.release.yml
+++ b/go/ql/consistency-queries/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.49
+lastReleaseVersion: 1.0.50
diff --git a/go/ql/consistency-queries/qlpack.yml b/go/ql/consistency-queries/qlpack.yml
index 49572c215bb..4c65036e5cf 100644
--- a/go/ql/consistency-queries/qlpack.yml
+++ b/go/ql/consistency-queries/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql-go-consistency-queries
-version: 1.0.50-dev
+version: 1.0.51-dev
 groups:
   - go
   - queries
diff --git a/go/ql/lib/CHANGELOG.md b/go/ql/lib/CHANGELOG.md
index 5043d924be0..54afc3a977b 100644
--- a/go/ql/lib/CHANGELOG.md
+++ b/go/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 7.1.1
+
+No user-facing changes.
+
 ## 7.1.0
 
 ### New Features
diff --git a/go/ql/lib/change-notes/released/7.1.1.md b/go/ql/lib/change-notes/released/7.1.1.md
new file mode 100644
index 00000000000..849fd4da328
--- /dev/null
+++ b/go/ql/lib/change-notes/released/7.1.1.md
@@ -0,0 +1,3 @@
+## 7.1.1
+
+No user-facing changes.
diff --git a/go/ql/lib/codeql-pack.release.yml b/go/ql/lib/codeql-pack.release.yml
index dcaaa76112a..8e970df6cae 100644
--- a/go/ql/lib/codeql-pack.release.yml
+++ b/go/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 7.1.0
+lastReleaseVersion: 7.1.1
diff --git a/go/ql/lib/qlpack.yml b/go/ql/lib/qlpack.yml
index 16ddb133517..f12cd33e5e0 100644
--- a/go/ql/lib/qlpack.yml
+++ b/go/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-all
-version: 7.1.1-dev
+version: 7.1.2-dev
 groups: go
 dbscheme: go.dbscheme
 extractor: go
diff --git a/go/ql/src/CHANGELOG.md b/go/ql/src/CHANGELOG.md
index ddda5dc4829..84d9ae7de59 100644
--- a/go/ql/src/CHANGELOG.md
+++ b/go/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.6.3
+
+No user-facing changes.
+
 ## 1.6.2
 
 No user-facing changes.
diff --git a/go/ql/src/change-notes/released/1.6.3.md b/go/ql/src/change-notes/released/1.6.3.md
new file mode 100644
index 00000000000..a000ecf7025
--- /dev/null
+++ b/go/ql/src/change-notes/released/1.6.3.md
@@ -0,0 +1,3 @@
+## 1.6.3
+
+No user-facing changes.
diff --git a/go/ql/src/codeql-pack.release.yml b/go/ql/src/codeql-pack.release.yml
index 5f5beb68311..00b51441d88 100644
--- a/go/ql/src/codeql-pack.release.yml
+++ b/go/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.6.2
+lastReleaseVersion: 1.6.3
diff --git a/go/ql/src/qlpack.yml b/go/ql/src/qlpack.yml
index 5fdc63fe363..40ad8f32001 100644
--- a/go/ql/src/qlpack.yml
+++ b/go/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/go-queries
-version: 1.6.3-dev
+version: 1.6.4-dev
 groups:
   - go
   - queries
diff --git a/java/ql/lib/CHANGELOG.md b/java/ql/lib/CHANGELOG.md
index 2187f00c399..a6c0cfc278a 100644
--- a/java/ql/lib/CHANGELOG.md
+++ b/java/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 9.1.1
+
+### Minor Analysis Improvements
+
+* Introduced a new sink kind `path-injection[read]` for Models-as-Data rows that only read from a path (such as `ClassLoader.getResource`, `FileInputStream`, `FileReader`, `Files.readAllBytes`, and related APIs). The general `java/path-injection` query continues to consider both `path-injection` and `path-injection[read]` sinks.
+
 ## 9.1.0
 
 ### New Features
diff --git a/java/ql/lib/change-notes/2026-04-21-path-injection-read-subkind.md b/java/ql/lib/change-notes/released/9.1.1.md
similarity index 88%
rename from java/ql/lib/change-notes/2026-04-21-path-injection-read-subkind.md
rename to java/ql/lib/change-notes/released/9.1.1.md
index bcd9479d2af..e4681c58644 100644
--- a/java/ql/lib/change-notes/2026-04-21-path-injection-read-subkind.md
+++ b/java/ql/lib/change-notes/released/9.1.1.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
+## 9.1.1
+
+### Minor Analysis Improvements
+
 * Introduced a new sink kind `path-injection[read]` for Models-as-Data rows that only read from a path (such as `ClassLoader.getResource`, `FileInputStream`, `FileReader`, `Files.readAllBytes`, and related APIs). The general `java/path-injection` query continues to consider both `path-injection` and `path-injection[read]` sinks.
diff --git a/java/ql/lib/codeql-pack.release.yml b/java/ql/lib/codeql-pack.release.yml
index 83ec2b42fcd..02e630d3384 100644
--- a/java/ql/lib/codeql-pack.release.yml
+++ b/java/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 9.1.0
+lastReleaseVersion: 9.1.1
diff --git a/java/ql/lib/qlpack.yml b/java/ql/lib/qlpack.yml
index e5ebb1d2131..aa9a2957362 100644
--- a/java/ql/lib/qlpack.yml
+++ b/java/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-all
-version: 9.1.1-dev
+version: 9.1.2-dev
 groups: java
 dbscheme: config/semmlecode.dbscheme
 extractor: java
diff --git a/java/ql/src/CHANGELOG.md b/java/ql/src/CHANGELOG.md
index fd13cbdcf83..fbbc339797b 100644
--- a/java/ql/src/CHANGELOG.md
+++ b/java/ql/src/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 1.11.3
+
+### Minor Analysis Improvements
+
+* The `java/zipslip` query no longer reports archive entry names that flow only to read-only path sinks such as `ClassLoader.getResource`, `FileInputStream`, and `FileReader`. The query now restricts its sinks to the `path-injection` kind and deliberately excludes the new `path-injection[read]` sub-kind, matching the Zip Slip threat model of unsafe archive extraction.
+
 ## 1.11.2
 
 No user-facing changes.
diff --git a/java/ql/src/change-notes/2026-04-21-zipslip-exclude-read-sinks.md b/java/ql/src/change-notes/released/1.11.3.md
similarity index 89%
rename from java/ql/src/change-notes/2026-04-21-zipslip-exclude-read-sinks.md
rename to java/ql/src/change-notes/released/1.11.3.md
index ee688924052..02f6fe7f16c 100644
--- a/java/ql/src/change-notes/2026-04-21-zipslip-exclude-read-sinks.md
+++ b/java/ql/src/change-notes/released/1.11.3.md
@@ -1,4 +1,5 @@
----
-category: minorAnalysis
----
+## 1.11.3
+
+### Minor Analysis Improvements
+
 * The `java/zipslip` query no longer reports archive entry names that flow only to read-only path sinks such as `ClassLoader.getResource`, `FileInputStream`, and `FileReader`. The query now restricts its sinks to the `path-injection` kind and deliberately excludes the new `path-injection[read]` sub-kind, matching the Zip Slip threat model of unsafe archive extraction.
diff --git a/java/ql/src/codeql-pack.release.yml b/java/ql/src/codeql-pack.release.yml
index 3e341cf85d5..220561dc648 100644
--- a/java/ql/src/codeql-pack.release.yml
+++ b/java/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.11.2
+lastReleaseVersion: 1.11.3
diff --git a/java/ql/src/qlpack.yml b/java/ql/src/qlpack.yml
index 3776af914c2..2005542ba0d 100644
--- a/java/ql/src/qlpack.yml
+++ b/java/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/java-queries
-version: 1.11.3-dev
+version: 1.11.4-dev
 groups:
   - java
   - queries
diff --git a/javascript/ql/lib/CHANGELOG.md b/javascript/ql/lib/CHANGELOG.md
index 53708faed09..c201b3a4b13 100644
--- a/javascript/ql/lib/CHANGELOG.md
+++ b/javascript/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.7.1
+
+No user-facing changes.
+
 ## 2.7.0
 
 ### New Features
diff --git a/javascript/ql/lib/change-notes/released/2.7.1.md b/javascript/ql/lib/change-notes/released/2.7.1.md
new file mode 100644
index 00000000000..e7c89e7954f
--- /dev/null
+++ b/javascript/ql/lib/change-notes/released/2.7.1.md
@@ -0,0 +1,3 @@
+## 2.7.1
+
+No user-facing changes.
diff --git a/javascript/ql/lib/codeql-pack.release.yml b/javascript/ql/lib/codeql-pack.release.yml
index 6a6c87f537d..820fb65a5c7 100644
--- a/javascript/ql/lib/codeql-pack.release.yml
+++ b/javascript/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.7.0
+lastReleaseVersion: 2.7.1
diff --git a/javascript/ql/lib/qlpack.yml b/javascript/ql/lib/qlpack.yml
index 623a7f4db2f..6e8e84b394d 100644
--- a/javascript/ql/lib/qlpack.yml
+++ b/javascript/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-all
-version: 2.7.1-dev
+version: 2.7.2-dev
 groups: javascript
 dbscheme: semmlecode.javascript.dbscheme
 extractor: javascript
diff --git a/javascript/ql/src/CHANGELOG.md b/javascript/ql/src/CHANGELOG.md
index 615c030de52..1a69291d145 100644
--- a/javascript/ql/src/CHANGELOG.md
+++ b/javascript/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.3.10
+
+No user-facing changes.
+
 ## 2.3.9
 
 No user-facing changes.
diff --git a/javascript/ql/src/change-notes/released/2.3.10.md b/javascript/ql/src/change-notes/released/2.3.10.md
new file mode 100644
index 00000000000..bc91b8aba45
--- /dev/null
+++ b/javascript/ql/src/change-notes/released/2.3.10.md
@@ -0,0 +1,3 @@
+## 2.3.10
+
+No user-facing changes.
diff --git a/javascript/ql/src/codeql-pack.release.yml b/javascript/ql/src/codeql-pack.release.yml
index 079eb5bfb0c..a4a2f98d509 100644
--- a/javascript/ql/src/codeql-pack.release.yml
+++ b/javascript/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.3.9
+lastReleaseVersion: 2.3.10
diff --git a/javascript/ql/src/qlpack.yml b/javascript/ql/src/qlpack.yml
index 593c0032466..e58cb3d2d94 100644
--- a/javascript/ql/src/qlpack.yml
+++ b/javascript/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/javascript-queries
-version: 2.3.10-dev
+version: 2.3.11-dev
 groups:
   - javascript
   - queries
diff --git a/misc/suite-helpers/CHANGELOG.md b/misc/suite-helpers/CHANGELOG.md
index d6d070a91bb..8e20945c6bf 100644
--- a/misc/suite-helpers/CHANGELOG.md
+++ b/misc/suite-helpers/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.50
+
+No user-facing changes.
+
 ## 1.0.49
 
 No user-facing changes.
diff --git a/misc/suite-helpers/change-notes/released/1.0.50.md b/misc/suite-helpers/change-notes/released/1.0.50.md
new file mode 100644
index 00000000000..c1e5becd9fc
--- /dev/null
+++ b/misc/suite-helpers/change-notes/released/1.0.50.md
@@ -0,0 +1,3 @@
+## 1.0.50
+
+No user-facing changes.
diff --git a/misc/suite-helpers/codeql-pack.release.yml b/misc/suite-helpers/codeql-pack.release.yml
index 596617977df..856137cc5db 100644
--- a/misc/suite-helpers/codeql-pack.release.yml
+++ b/misc/suite-helpers/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.49
+lastReleaseVersion: 1.0.50
diff --git a/misc/suite-helpers/qlpack.yml b/misc/suite-helpers/qlpack.yml
index 802112d0fc8..fd00605cfd1 100644
--- a/misc/suite-helpers/qlpack.yml
+++ b/misc/suite-helpers/qlpack.yml
@@ -1,4 +1,4 @@
 name: codeql/suite-helpers
-version: 1.0.50-dev
+version: 1.0.51-dev
 groups: shared
 warnOnImplicitThis: true
diff --git a/python/ql/lib/CHANGELOG.md b/python/ql/lib/CHANGELOG.md
index 8ede35e9bdc..3d09821803b 100644
--- a/python/ql/lib/CHANGELOG.md
+++ b/python/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 7.1.1
+
+No user-facing changes.
+
 ## 7.1.0
 
 ### New Features
diff --git a/python/ql/lib/change-notes/released/7.1.1.md b/python/ql/lib/change-notes/released/7.1.1.md
new file mode 100644
index 00000000000..849fd4da328
--- /dev/null
+++ b/python/ql/lib/change-notes/released/7.1.1.md
@@ -0,0 +1,3 @@
+## 7.1.1
+
+No user-facing changes.
diff --git a/python/ql/lib/codeql-pack.release.yml b/python/ql/lib/codeql-pack.release.yml
index dcaaa76112a..8e970df6cae 100644
--- a/python/ql/lib/codeql-pack.release.yml
+++ b/python/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 7.1.0
+lastReleaseVersion: 7.1.1
diff --git a/python/ql/lib/qlpack.yml b/python/ql/lib/qlpack.yml
index 724d270b4e8..981ab78ff33 100644
--- a/python/ql/lib/qlpack.yml
+++ b/python/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-all
-version: 7.1.1-dev
+version: 7.1.2-dev
 groups: python
 dbscheme: semmlecode.python.dbscheme
 extractor: python
diff --git a/python/ql/src/CHANGELOG.md b/python/ql/src/CHANGELOG.md
index 8676d754d01..544b9778d4d 100644
--- a/python/ql/src/CHANGELOG.md
+++ b/python/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.8.3
+
+No user-facing changes.
+
 ## 1.8.2
 
 No user-facing changes.
diff --git a/python/ql/src/change-notes/released/1.8.3.md b/python/ql/src/change-notes/released/1.8.3.md
new file mode 100644
index 00000000000..5b25a447c30
--- /dev/null
+++ b/python/ql/src/change-notes/released/1.8.3.md
@@ -0,0 +1,3 @@
+## 1.8.3
+
+No user-facing changes.
diff --git a/python/ql/src/codeql-pack.release.yml b/python/ql/src/codeql-pack.release.yml
index 559af8348bb..8071ef421ab 100644
--- a/python/ql/src/codeql-pack.release.yml
+++ b/python/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.8.2
+lastReleaseVersion: 1.8.3
diff --git a/python/ql/src/qlpack.yml b/python/ql/src/qlpack.yml
index 0544fddc168..2fc026ff480 100644
--- a/python/ql/src/qlpack.yml
+++ b/python/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/python-queries
-version: 1.8.3-dev
+version: 1.8.4-dev
 groups:
   - python
   - queries
diff --git a/ruby/ql/lib/CHANGELOG.md b/ruby/ql/lib/CHANGELOG.md
index e8dd84283c6..07859d0f0e6 100644
--- a/ruby/ql/lib/CHANGELOG.md
+++ b/ruby/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 5.2.1
+
+No user-facing changes.
+
 ## 5.2.0
 
 ### New Features
diff --git a/ruby/ql/lib/change-notes/released/5.2.1.md b/ruby/ql/lib/change-notes/released/5.2.1.md
new file mode 100644
index 00000000000..8d65db4e16d
--- /dev/null
+++ b/ruby/ql/lib/change-notes/released/5.2.1.md
@@ -0,0 +1,3 @@
+## 5.2.1
+
+No user-facing changes.
diff --git a/ruby/ql/lib/codeql-pack.release.yml b/ruby/ql/lib/codeql-pack.release.yml
index 9e57a36a7dc..1684d0e72a2 100644
--- a/ruby/ql/lib/codeql-pack.release.yml
+++ b/ruby/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 5.2.0
+lastReleaseVersion: 5.2.1
diff --git a/ruby/ql/lib/qlpack.yml b/ruby/ql/lib/qlpack.yml
index cfdaf454426..df8efbe68de 100644
--- a/ruby/ql/lib/qlpack.yml
+++ b/ruby/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-all
-version: 5.2.1-dev
+version: 5.2.2-dev
 groups: ruby
 extractor: ruby
 dbscheme: ruby.dbscheme
diff --git a/ruby/ql/src/CHANGELOG.md b/ruby/ql/src/CHANGELOG.md
index 927a40e596d..c874059c151 100644
--- a/ruby/ql/src/CHANGELOG.md
+++ b/ruby/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.6.3
+
+No user-facing changes.
+
 ## 1.6.2
 
 No user-facing changes.
diff --git a/ruby/ql/src/change-notes/released/1.6.3.md b/ruby/ql/src/change-notes/released/1.6.3.md
new file mode 100644
index 00000000000..a000ecf7025
--- /dev/null
+++ b/ruby/ql/src/change-notes/released/1.6.3.md
@@ -0,0 +1,3 @@
+## 1.6.3
+
+No user-facing changes.
diff --git a/ruby/ql/src/codeql-pack.release.yml b/ruby/ql/src/codeql-pack.release.yml
index 5f5beb68311..00b51441d88 100644
--- a/ruby/ql/src/codeql-pack.release.yml
+++ b/ruby/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.6.2
+lastReleaseVersion: 1.6.3
diff --git a/ruby/ql/src/qlpack.yml b/ruby/ql/src/qlpack.yml
index beaf92c0d8a..b68d13e5908 100644
--- a/ruby/ql/src/qlpack.yml
+++ b/ruby/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ruby-queries
-version: 1.6.3-dev
+version: 1.6.4-dev
 groups:
   - ruby
   - queries
diff --git a/rust/ql/lib/CHANGELOG.md b/rust/ql/lib/CHANGELOG.md
index 30ae7d73b67..d85d27d88d6 100644
--- a/rust/ql/lib/CHANGELOG.md
+++ b/rust/ql/lib/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.2.14
+
+No user-facing changes.
+
 ## 0.2.13
 
 ### New Features
diff --git a/rust/ql/lib/change-notes/released/0.2.14.md b/rust/ql/lib/change-notes/released/0.2.14.md
new file mode 100644
index 00000000000..f2d005e6285
--- /dev/null
+++ b/rust/ql/lib/change-notes/released/0.2.14.md
@@ -0,0 +1,3 @@
+## 0.2.14
+
+No user-facing changes.
diff --git a/rust/ql/lib/codeql-pack.release.yml b/rust/ql/lib/codeql-pack.release.yml
index 979eb20092e..c53820a76d5 100644
--- a/rust/ql/lib/codeql-pack.release.yml
+++ b/rust/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.2.13
+lastReleaseVersion: 0.2.14
diff --git a/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll b/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll
index 423ad21ae4a..fd99060d404 100644
--- a/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll
+++ b/rust/ql/lib/codeql/rust/internal/typeinference/TypeInference.qll
@@ -222,8 +222,6 @@ private module Input2Common {
 }
 
 private module PreInput2 implements InputSig2<PreTypeMention> {
-  PreTypeMention getABaseTypeMention(Type t) { none() }
-
   PreTypeMention getATypeParameterConstraint(TypeParameter tp) {
     result = Input2Common::getATypeParameterConstraint(tp)
   }
@@ -248,8 +246,6 @@ private module PreInput2 implements InputSig2<PreTypeMention> {
 module PreM2 = Make2<PreTypeMention, PreInput2>;
 
 private module Input2 implements InputSig2<TypeMention> {
-  TypeMention getABaseTypeMention(Type t) { none() }
-
   TypeMention getATypeParameterConstraint(TypeParameter tp) {
     result = Input2Common::getATypeParameterConstraint(tp)
   }
diff --git a/rust/ql/lib/qlpack.yml b/rust/ql/lib/qlpack.yml
index 47f846eb02b..062c2f4e635 100644
--- a/rust/ql/lib/qlpack.yml
+++ b/rust/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rust-all
-version: 0.2.14-dev
+version: 0.2.15-dev
 groups: rust
 extractor: rust
 dbscheme: rust.dbscheme
diff --git a/rust/ql/src/CHANGELOG.md b/rust/ql/src/CHANGELOG.md
index 4b735337c90..ad1e8ef3bfe 100644
--- a/rust/ql/src/CHANGELOG.md
+++ b/rust/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.1.35
+
+No user-facing changes.
+
 ## 0.1.34
 
 No user-facing changes.
diff --git a/rust/ql/src/change-notes/released/0.1.35.md b/rust/ql/src/change-notes/released/0.1.35.md
new file mode 100644
index 00000000000..5ac57c1d977
--- /dev/null
+++ b/rust/ql/src/change-notes/released/0.1.35.md
@@ -0,0 +1,3 @@
+## 0.1.35
+
+No user-facing changes.
diff --git a/rust/ql/src/codeql-pack.release.yml b/rust/ql/src/codeql-pack.release.yml
index a1d4333b19b..6a5806eec2b 100644
--- a/rust/ql/src/codeql-pack.release.yml
+++ b/rust/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.1.34
+lastReleaseVersion: 0.1.35
diff --git a/rust/ql/src/qlpack.yml b/rust/ql/src/qlpack.yml
index ec76e8f1265..67966540de6 100644
--- a/rust/ql/src/qlpack.yml
+++ b/rust/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rust-queries
-version: 0.1.35-dev
+version: 0.1.36-dev
 groups:
   - rust
   - queries
diff --git a/shared/concepts/CHANGELOG.md b/shared/concepts/CHANGELOG.md
index 59942922ea0..e2de2975455 100644
--- a/shared/concepts/CHANGELOG.md
+++ b/shared/concepts/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.24
+
+No user-facing changes.
+
 ## 0.0.23
 
 No user-facing changes.
diff --git a/shared/concepts/change-notes/released/0.0.24.md b/shared/concepts/change-notes/released/0.0.24.md
new file mode 100644
index 00000000000..84995db2aff
--- /dev/null
+++ b/shared/concepts/change-notes/released/0.0.24.md
@@ -0,0 +1,3 @@
+## 0.0.24
+
+No user-facing changes.
diff --git a/shared/concepts/codeql-pack.release.yml b/shared/concepts/codeql-pack.release.yml
index cc2195603d8..b956773a07f 100644
--- a/shared/concepts/codeql-pack.release.yml
+++ b/shared/concepts/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.23
+lastReleaseVersion: 0.0.24
diff --git a/shared/concepts/qlpack.yml b/shared/concepts/qlpack.yml
index 6943387bae2..c51537b2228 100644
--- a/shared/concepts/qlpack.yml
+++ b/shared/concepts/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/concepts
-version: 0.0.24-dev
+version: 0.0.25-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/controlflow/CHANGELOG.md b/shared/controlflow/CHANGELOG.md
index 9c6d7c09d17..dc02f115c99 100644
--- a/shared/controlflow/CHANGELOG.md
+++ b/shared/controlflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.34
+
+No user-facing changes.
+
 ## 2.0.33
 
 No user-facing changes.
diff --git a/shared/controlflow/change-notes/released/2.0.34.md b/shared/controlflow/change-notes/released/2.0.34.md
new file mode 100644
index 00000000000..fd170d38ce6
--- /dev/null
+++ b/shared/controlflow/change-notes/released/2.0.34.md
@@ -0,0 +1,3 @@
+## 2.0.34
+
+No user-facing changes.
diff --git a/shared/controlflow/codeql-pack.release.yml b/shared/controlflow/codeql-pack.release.yml
index 92e23200b4d..339a3ce7c57 100644
--- a/shared/controlflow/codeql-pack.release.yml
+++ b/shared/controlflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.33
+lastReleaseVersion: 2.0.34
diff --git a/shared/controlflow/qlpack.yml b/shared/controlflow/qlpack.yml
index 7fbe2fd4ea9..e33617ca4f0 100644
--- a/shared/controlflow/qlpack.yml
+++ b/shared/controlflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/controlflow
-version: 2.0.34-dev
+version: 2.0.35-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/dataflow/CHANGELOG.md b/shared/dataflow/CHANGELOG.md
index 9e4ca0a0ea8..7ecbeda3b21 100644
--- a/shared/dataflow/CHANGELOG.md
+++ b/shared/dataflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.1.6
+
+No user-facing changes.
+
 ## 2.1.5
 
 No user-facing changes.
diff --git a/shared/dataflow/change-notes/released/2.1.6.md b/shared/dataflow/change-notes/released/2.1.6.md
new file mode 100644
index 00000000000..39543a53672
--- /dev/null
+++ b/shared/dataflow/change-notes/released/2.1.6.md
@@ -0,0 +1,3 @@
+## 2.1.6
+
+No user-facing changes.
diff --git a/shared/dataflow/codeql-pack.release.yml b/shared/dataflow/codeql-pack.release.yml
index a890ff0111c..1c810b60c4a 100644
--- a/shared/dataflow/codeql-pack.release.yml
+++ b/shared/dataflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.1.5
+lastReleaseVersion: 2.1.6
diff --git a/shared/dataflow/qlpack.yml b/shared/dataflow/qlpack.yml
index 34336f4c322..2058b35be64 100644
--- a/shared/dataflow/qlpack.yml
+++ b/shared/dataflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/dataflow
-version: 2.1.6-dev
+version: 2.1.7-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/mad/CHANGELOG.md b/shared/mad/CHANGELOG.md
index 5d5551d10a3..964c1bb1d98 100644
--- a/shared/mad/CHANGELOG.md
+++ b/shared/mad/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.50
+
+No user-facing changes.
+
 ## 1.0.49
 
 No user-facing changes.
diff --git a/shared/mad/change-notes/released/1.0.50.md b/shared/mad/change-notes/released/1.0.50.md
new file mode 100644
index 00000000000..c1e5becd9fc
--- /dev/null
+++ b/shared/mad/change-notes/released/1.0.50.md
@@ -0,0 +1,3 @@
+## 1.0.50
+
+No user-facing changes.
diff --git a/shared/mad/codeql-pack.release.yml b/shared/mad/codeql-pack.release.yml
index 596617977df..856137cc5db 100644
--- a/shared/mad/codeql-pack.release.yml
+++ b/shared/mad/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.49
+lastReleaseVersion: 1.0.50
diff --git a/shared/mad/qlpack.yml b/shared/mad/qlpack.yml
index 5631fbf1a73..fb135546a90 100644
--- a/shared/mad/qlpack.yml
+++ b/shared/mad/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/mad
-version: 1.0.50-dev
+version: 1.0.51-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/quantum/CHANGELOG.md b/shared/quantum/CHANGELOG.md
index be06e2108a8..7153b9314b1 100644
--- a/shared/quantum/CHANGELOG.md
+++ b/shared/quantum/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.28
+
+No user-facing changes.
+
 ## 0.0.27
 
 No user-facing changes.
diff --git a/shared/quantum/change-notes/released/0.0.28.md b/shared/quantum/change-notes/released/0.0.28.md
new file mode 100644
index 00000000000..1b4fdd47819
--- /dev/null
+++ b/shared/quantum/change-notes/released/0.0.28.md
@@ -0,0 +1,3 @@
+## 0.0.28
+
+No user-facing changes.
diff --git a/shared/quantum/codeql-pack.release.yml b/shared/quantum/codeql-pack.release.yml
index dbab90d6989..3462db7d348 100644
--- a/shared/quantum/codeql-pack.release.yml
+++ b/shared/quantum/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.27
+lastReleaseVersion: 0.0.28
diff --git a/shared/quantum/qlpack.yml b/shared/quantum/qlpack.yml
index 794f238b6e9..951cce392ae 100644
--- a/shared/quantum/qlpack.yml
+++ b/shared/quantum/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/quantum
-version: 0.0.28-dev
+version: 0.0.29-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/rangeanalysis/CHANGELOG.md b/shared/rangeanalysis/CHANGELOG.md
index 8b457ef5927..e2a893046c9 100644
--- a/shared/rangeanalysis/CHANGELOG.md
+++ b/shared/rangeanalysis/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.50
+
+No user-facing changes.
+
 ## 1.0.49
 
 No user-facing changes.
diff --git a/shared/rangeanalysis/change-notes/released/1.0.50.md b/shared/rangeanalysis/change-notes/released/1.0.50.md
new file mode 100644
index 00000000000..c1e5becd9fc
--- /dev/null
+++ b/shared/rangeanalysis/change-notes/released/1.0.50.md
@@ -0,0 +1,3 @@
+## 1.0.50
+
+No user-facing changes.
diff --git a/shared/rangeanalysis/codeql-pack.release.yml b/shared/rangeanalysis/codeql-pack.release.yml
index 596617977df..856137cc5db 100644
--- a/shared/rangeanalysis/codeql-pack.release.yml
+++ b/shared/rangeanalysis/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.49
+lastReleaseVersion: 1.0.50
diff --git a/shared/rangeanalysis/qlpack.yml b/shared/rangeanalysis/qlpack.yml
index e43819bf36e..41f319731b0 100644
--- a/shared/rangeanalysis/qlpack.yml
+++ b/shared/rangeanalysis/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/rangeanalysis
-version: 1.0.50-dev
+version: 1.0.51-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/regex/CHANGELOG.md b/shared/regex/CHANGELOG.md
index 639cede00af..bb83dfc0a1f 100644
--- a/shared/regex/CHANGELOG.md
+++ b/shared/regex/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.50
+
+No user-facing changes.
+
 ## 1.0.49
 
 No user-facing changes.
diff --git a/shared/regex/change-notes/released/1.0.50.md b/shared/regex/change-notes/released/1.0.50.md
new file mode 100644
index 00000000000..c1e5becd9fc
--- /dev/null
+++ b/shared/regex/change-notes/released/1.0.50.md
@@ -0,0 +1,3 @@
+## 1.0.50
+
+No user-facing changes.
diff --git a/shared/regex/codeql-pack.release.yml b/shared/regex/codeql-pack.release.yml
index 596617977df..856137cc5db 100644
--- a/shared/regex/codeql-pack.release.yml
+++ b/shared/regex/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.49
+lastReleaseVersion: 1.0.50
diff --git a/shared/regex/qlpack.yml b/shared/regex/qlpack.yml
index 242382c6a1f..198bf43da04 100644
--- a/shared/regex/qlpack.yml
+++ b/shared/regex/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/regex
-version: 1.0.50-dev
+version: 1.0.51-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/ssa/CHANGELOG.md b/shared/ssa/CHANGELOG.md
index 9cfbb004657..f9145f2c88b 100644
--- a/shared/ssa/CHANGELOG.md
+++ b/shared/ssa/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.26
+
+No user-facing changes.
+
 ## 2.0.25
 
 No user-facing changes.
diff --git a/shared/ssa/change-notes/released/2.0.26.md b/shared/ssa/change-notes/released/2.0.26.md
new file mode 100644
index 00000000000..9b1fe95f577
--- /dev/null
+++ b/shared/ssa/change-notes/released/2.0.26.md
@@ -0,0 +1,3 @@
+## 2.0.26
+
+No user-facing changes.
diff --git a/shared/ssa/codeql-pack.release.yml b/shared/ssa/codeql-pack.release.yml
index f54d8620118..63d57bef481 100644
--- a/shared/ssa/codeql-pack.release.yml
+++ b/shared/ssa/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.25
+lastReleaseVersion: 2.0.26
diff --git a/shared/ssa/qlpack.yml b/shared/ssa/qlpack.yml
index 9e510c43dd0..5f8de945745 100644
--- a/shared/ssa/qlpack.yml
+++ b/shared/ssa/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/ssa
-version: 2.0.26-dev
+version: 2.0.27-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/threat-models/CHANGELOG.md b/shared/threat-models/CHANGELOG.md
index a6b6055373a..512a5732ccd 100644
--- a/shared/threat-models/CHANGELOG.md
+++ b/shared/threat-models/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.50
+
+No user-facing changes.
+
 ## 1.0.49
 
 No user-facing changes.
diff --git a/shared/threat-models/change-notes/released/1.0.50.md b/shared/threat-models/change-notes/released/1.0.50.md
new file mode 100644
index 00000000000..c1e5becd9fc
--- /dev/null
+++ b/shared/threat-models/change-notes/released/1.0.50.md
@@ -0,0 +1,3 @@
+## 1.0.50
+
+No user-facing changes.
diff --git a/shared/threat-models/codeql-pack.release.yml b/shared/threat-models/codeql-pack.release.yml
index 596617977df..856137cc5db 100644
--- a/shared/threat-models/codeql-pack.release.yml
+++ b/shared/threat-models/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.49
+lastReleaseVersion: 1.0.50
diff --git a/shared/threat-models/qlpack.yml b/shared/threat-models/qlpack.yml
index 14e33e435d1..c3ac3656b3a 100644
--- a/shared/threat-models/qlpack.yml
+++ b/shared/threat-models/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/threat-models
-version: 1.0.50-dev
+version: 1.0.51-dev
 library: true
 groups: shared
 dataExtensions:
diff --git a/shared/tutorial/CHANGELOG.md b/shared/tutorial/CHANGELOG.md
index 5fcacc0b8b5..c98a035d149 100644
--- a/shared/tutorial/CHANGELOG.md
+++ b/shared/tutorial/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.50
+
+No user-facing changes.
+
 ## 1.0.49
 
 No user-facing changes.
diff --git a/shared/tutorial/change-notes/released/1.0.50.md b/shared/tutorial/change-notes/released/1.0.50.md
new file mode 100644
index 00000000000..c1e5becd9fc
--- /dev/null
+++ b/shared/tutorial/change-notes/released/1.0.50.md
@@ -0,0 +1,3 @@
+## 1.0.50
+
+No user-facing changes.
diff --git a/shared/tutorial/codeql-pack.release.yml b/shared/tutorial/codeql-pack.release.yml
index 596617977df..856137cc5db 100644
--- a/shared/tutorial/codeql-pack.release.yml
+++ b/shared/tutorial/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.49
+lastReleaseVersion: 1.0.50
diff --git a/shared/tutorial/qlpack.yml b/shared/tutorial/qlpack.yml
index 10b77ca0438..e68fe7948ff 100644
--- a/shared/tutorial/qlpack.yml
+++ b/shared/tutorial/qlpack.yml
@@ -1,7 +1,7 @@
 name: codeql/tutorial
 description: Library for the CodeQL detective tutorials, helping new users learn to
   write CodeQL queries.
-version: 1.0.50-dev
+version: 1.0.51-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/typeflow/CHANGELOG.md b/shared/typeflow/CHANGELOG.md
index fbfdb431161..de43834a84e 100644
--- a/shared/typeflow/CHANGELOG.md
+++ b/shared/typeflow/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.50
+
+No user-facing changes.
+
 ## 1.0.49
 
 No user-facing changes.
diff --git a/shared/typeflow/change-notes/released/1.0.50.md b/shared/typeflow/change-notes/released/1.0.50.md
new file mode 100644
index 00000000000..c1e5becd9fc
--- /dev/null
+++ b/shared/typeflow/change-notes/released/1.0.50.md
@@ -0,0 +1,3 @@
+## 1.0.50
+
+No user-facing changes.
diff --git a/shared/typeflow/codeql-pack.release.yml b/shared/typeflow/codeql-pack.release.yml
index 596617977df..856137cc5db 100644
--- a/shared/typeflow/codeql-pack.release.yml
+++ b/shared/typeflow/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.49
+lastReleaseVersion: 1.0.50
diff --git a/shared/typeflow/qlpack.yml b/shared/typeflow/qlpack.yml
index 9301be5228f..482138349ac 100644
--- a/shared/typeflow/qlpack.yml
+++ b/shared/typeflow/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeflow
-version: 1.0.50-dev
+version: 1.0.51-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typeinference/CHANGELOG.md b/shared/typeinference/CHANGELOG.md
index 1652285654a..3bbb96e59a9 100644
--- a/shared/typeinference/CHANGELOG.md
+++ b/shared/typeinference/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 0.0.31
+
+No user-facing changes.
+
 ## 0.0.30
 
 No user-facing changes.
diff --git a/shared/typeinference/change-notes/released/0.0.31.md b/shared/typeinference/change-notes/released/0.0.31.md
new file mode 100644
index 00000000000..99e11d52c92
--- /dev/null
+++ b/shared/typeinference/change-notes/released/0.0.31.md
@@ -0,0 +1,3 @@
+## 0.0.31
+
+No user-facing changes.
diff --git a/shared/typeinference/codeql-pack.release.yml b/shared/typeinference/codeql-pack.release.yml
index 0c61b463bab..54b504d06ec 100644
--- a/shared/typeinference/codeql-pack.release.yml
+++ b/shared/typeinference/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 0.0.30
+lastReleaseVersion: 0.0.31
diff --git a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
index cf82d77b5e1..24a6392c6be 100644
--- a/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
+++ b/shared/typeinference/codeql/typeinference/internal/TypeInference.qll
@@ -155,8 +155,8 @@ signature module InputSig1<LocationSig Location> {
   class TypeParameter extends Type;
 
   /**
-   * A type abstraction. I.e., a place in the program where type variables are
-   * introduced.
+   * A type abstraction. I.e., a place in the program where type variables may
+   * be introduced.
    *
    * Example in C#:
    * ```csharp
@@ -171,7 +171,7 @@ signature module InputSig1<LocationSig Location> {
    * ```
    */
   class TypeAbstraction {
-    /** Gets a type parameter introduced by this abstraction. */
+    /** Gets a type parameter introduced by this abstraction, if any. */
     TypeParameter getATypeParameter();
 
     /** Gets a textual representation of this type abstraction. */
@@ -324,56 +324,31 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
   /**
    * Provides the input to `Make2`.
    *
-   * The `TypeMention` parameter is used to build the base type hierarchy based on
-   * `getABaseTypeMention` and to construct the constraint satisfaction
-   * hierarchy based on `conditionSatisfiesConstraint`.
-   *
-   * It will usually be based on syntactic occurrences of types in the source
-   * code. For example, in
-   *
-   * ```csharp
-   * class C<T> : Base<T>, Interface { }
-   * ```
-   *
-   * a type mention would exist for `Base<T>` and resolve to the following
-   * types:
-   *
-   * `TypePath` | `Type`
-   * ---------- | -------
-   * `""`       | ``Base`1``
-   * `"0"`      | `T`
+   * The `TypeMention` parameter is used to construct the constraint satisfaction
+   * hierarchy based on `conditionSatisfiesConstraint`, which is general enough
+   * to model both class hierarchies and trait implementation hierarchies in Rust.
    */
   signature module InputSig2<HasTypeTreeSig TypeMention> {
-    /**
-     * Gets a base type mention of `t`, if any. Example:
-     *
-     * ```csharp
-     * class C<T> : Base<T>, Interface { }
-     * //    ^ `t`
-     * //           ^^^^^^^ `result`
-     * //                    ^^^^^^^^^ `result`
-     * ```
-     */
-    TypeMention getABaseTypeMention(Type t);
-
     /**
      * Gets a type constraint on the type parameter `tp`, if any. All
      * instantiations of the type parameter must satisfy the constraint.
      *
      * For example, in
+     *
      * ```csharp
      * class GenericClass<T> : IComparable<GenericClass<T>>
      * //                 ^ `tp`
      *     where T : IComparable<T> { }
      * //            ^^^^^^^^^^^^^^ `result`
      * ```
+     *
      * the type parameter `T` has the constraint `IComparable<T>`.
      */
     TypeMention getATypeParameterConstraint(TypeParameter tp);
 
     /**
      * Holds if
-     * - `abs` is a type abstraction that introduces type variables that are
+     * - `abs` is a type abstraction that may introduce type variables that are
      *   free in `condition` and `constraint`,
      * - and for every instantiation of the type parameters from `abs` the
      *   resulting `condition` satisfies the constraint given by `constraint`.
@@ -381,6 +356,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
      *   through `constraint` should also apply to `condition`.
      *
      * Example in C#:
+     *
      * ```csharp
      * class C<T> : IComparable<C<T>> { }
      * //     ^^^ `abs`
@@ -389,6 +365,7 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
      * ```
      *
      * Example in Rust:
+     *
      * ```rust
      * impl<A> Trait<i64, A> for Type<String, A> { }
      * //  ^^^ `abs`             ^^^^^^^^^^^^^^^ `condition`
@@ -397,20 +374,24 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
      *
      * To see how `abs` changes the meaning of the type parameters that occur in
      * `condition`, consider the following examples in Rust:
+     *
      * ```rust
      * impl<T> Trait for T { }
      * //  ^^^ `abs`     ^ `condition`
      * //      ^^^^^ `constraint`
      * ```
+     *
      * Here the meaning is "for all type parameters `T` it is the case that `T`
      * implements `Trait`". On the other hand, in
+     *
      * ```rust
      * fn foo<T: Trait>() { }
      * //     ^ `condition`
      * //        ^^^^^ `constraint`
      * ```
+     *
      * the meaning is "`T` implements `Trait`" where the constraint is only
-     * valid for the specific `T`. Note that `condition` and `condition` are
+     * valid for the specific `T`. Note that `condition` and `constraint` are
      * identical in the two examples. To encode the difference, `abs` in the
      * first example should contain `T` whereas in the seconds example `abs`
      * should be empty.
@@ -825,99 +806,6 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
       predicate multipleConstraintImplementations(Type conditionRoot, Type constraintRoot) {
         countConstraintImplementations(conditionRoot, constraintRoot) > 1
       }
-
-      /**
-       * Holds if `baseMention` is a (transitive) base type mention of `sub`,
-       * and `t` is mentioned (implicitly) at `path` inside `baseMention`. For
-       * example, in
-       *
-       * ```csharp
-       * class C<T1> { }
-       *
-       * class Base<T2> { }
-       *
-       * class Mid<T3> : Base<C<T3>> { }
-       *
-       * class Sub<T4> : Mid<C<T4>> { } // Sub<T4> extends Base<C<C<T4>>
-       * ```
-       *
-       * - ``C`1`` is mentioned at `T2` for immediate base type mention `Base<C<T3>>`
-       *   of `Mid`,
-       * - `T3` is mentioned at `T2.T1` for immediate base type mention `Base<C<T3>>`
-       *   of `Mid`,
-       * - ``C`1`` is mentioned at `T3` for immediate base type mention `Mid<C<T4>>`
-       *   of `Sub`,
-       * - `T4` is mentioned at `T3.T1` for immediate base type mention `Mid<C<T4>>`
-       *   of `Sub`,
-       * - ``C`1`` is mentioned at `T2` and implicitly at `T2.T1` for transitive base type
-       *   mention `Base<C<T3>>` of `Sub`, and
-       * - `T4` is mentioned implicitly at `T2.T1.T1` for transitive base type mention
-       *   `Base<C<T3>>` of `Sub`.
-       */
-      pragma[nomagic]
-      predicate baseTypeMentionHasTypeAt(Type sub, TypeMention baseMention, TypePath path, Type t) {
-        exists(TypeMention immediateBaseMention |
-          pragma[only_bind_into](immediateBaseMention) =
-            getABaseTypeMention(pragma[only_bind_into](sub))
-        |
-          // immediate base class
-          baseMention = immediateBaseMention and
-          t = immediateBaseMention.getTypeAt(path)
-          or
-          // transitive base class
-          exists(Type immediateBase | immediateBase = getTypeMentionRoot(immediateBaseMention) |
-            baseTypeMentionHasNonTypeParameterAt(immediateBase, baseMention, path, t)
-            or
-            exists(TypePath path0, TypePath prefix, TypePath suffix, TypeParameter tp |
-              /*
-               * Example:
-               *
-               * - `prefix = "T2.T1"`,
-               * - `path0 = "T3"`,
-               * - `suffix = ""`,
-               * - `path = "T2.T1"`
-               *
-               * ```csharp
-               * class C<T1> { }
-               *       ^ `t`
-               *
-               * class Base<T2> { }
-               *
-               * class Mid<T3> : Base<C<T3>> { }
-               * //    ^^^ `immediateBase`
-               * //        ^^ `tp`
-               * //              ^^^^^^^^^^^ `baseMention`
-               *
-               * class Sub<T4> : Mid<C<T4>> { }
-               * //    ^^^ `sub`
-               * //              ^^^^^^^^^^ `immediateBaseMention`
-               * ```
-               */
-
-              baseTypeMentionHasTypeParameterAt(immediateBase, baseMention, prefix, tp) and
-              t = immediateBaseMention.getTypeAt(path0) and
-              path0.isCons(tp, suffix) and
-              path = prefix.append(suffix)
-            )
-          )
-        )
-      }
-
-      overlay[caller?]
-      pragma[inline]
-      predicate baseTypeMentionHasNonTypeParameterAt(
-        Type sub, TypeMention baseMention, TypePath path, Type t
-      ) {
-        not t = sub.getATypeParameter() and baseTypeMentionHasTypeAt(sub, baseMention, path, t)
-      }
-
-      overlay[caller?]
-      pragma[inline]
-      predicate baseTypeMentionHasTypeParameterAt(
-        Type sub, TypeMention baseMention, TypePath path, TypeParameter tp
-      ) {
-        tp = sub.getATypeParameter() and baseTypeMentionHasTypeAt(sub, baseMention, path, tp)
-      }
     }
 
     private import BaseTypes
@@ -1503,76 +1391,135 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
 
       private module AccessBaseType {
         /**
-         * Holds if inferring types at `a` in environment `e` might depend on the type at
-         * `path` of `apos` having `base` as a transitive base type.
+         * Holds if the type of `target` at `apos` and `pathToTp` is type parameter `tp`,
+         * and an argument with root type `argRootType` may be able to be matched against
+         * `tp` via the `conditionSatisfiesConstraint` hierarchy.
          */
-        private predicate relevantAccess(
-          Access a, AccessEnvironment e, AccessPosition apos, Type base
+        pragma[nomagic]
+        private predicate argRootTypeSatisfiesTargetTypeCand(
+          Type argRootType, Declaration target, AccessPosition apos, TypeParameter tp,
+          TypePath pathToTp
         ) {
-          exists(Declaration target, DeclarationPosition dpos |
-            target = a.getTarget(e) and
+          exists(
+            DeclarationPosition dpos, TypeMention condition, TypeMention constraint,
+            Type constraintRootType
+          |
             accessDeclarationPositionMatch(apos, dpos) and
-            declarationBaseType(target, dpos, base, _, _)
+            tp = target.getDeclaredType(dpos, pathToTp) and
+            conditionSatisfiesConstraintTypeAt(_, condition, constraint, TypePath::nil(),
+              constraintRootType) and
+            constraintRootType = target.getDeclaredType(dpos, TypePath::nil()) and
+            argRootType = condition.getTypeAt(TypePath::nil())
           )
         }
 
+        private newtype TRelevantTarget =
+          MkRelevantTarget(Declaration target, AccessPosition apos) {
+            argRootTypeSatisfiesTargetTypeCand(_, target, apos, _, _)
+          }
+
+        private class RelevantTarget extends MkRelevantTarget {
+          Declaration target;
+          AccessPosition apos;
+
+          RelevantTarget() { this = MkRelevantTarget(target, apos) }
+
+          Type getTypeAt(TypePath path) {
+            exists(DeclarationPosition dpos |
+              accessDeclarationPositionMatch(apos, dpos) and
+              result = target.getDeclaredType(dpos, path)
+            )
+          }
+
+          string toString() { result = target.toString() + ", " + apos.toString() }
+
+          Location getLocation() { result = target.getLocation() }
+        }
+
         pragma[nomagic]
-        private Type inferTypeAt(
-          Access a, AccessEnvironment e, AccessPosition apos, TypeParameter tp, TypePath suffix
+        private predicate argRootTypeSatisfiesTargetTypeCand(
+          Type argRootType, Access a, AccessEnvironment e, Declaration target, AccessPosition apos,
+          TypeParameter tp, TypePath pathToTp
         ) {
-          relevantAccess(a, e, apos, _) and
-          exists(TypePath path0 |
-            result = a.getInferredType(e, apos, path0) and
-            path0.isCons(tp, suffix)
-          )
+          target = a.getTarget(e) and
+          argRootTypeSatisfiesTargetTypeCand(argRootType, target, apos, tp, pathToTp) and
+          not exists(getTypeArgument(a, target, tp, _))
         }
 
+        private newtype TRelevantAccess =
+          MkRelevantAccess(Access a, AccessPosition apos, AccessEnvironment e) {
+            argRootTypeSatisfiesTargetTypeCand(a.getInferredType(e, apos, TypePath::nil()), a, e, _,
+              apos, _, _)
+          }
+
+        private class RelevantAccess extends MkRelevantAccess {
+          Access a;
+          AccessPosition apos;
+          AccessEnvironment e;
+
+          RelevantAccess() { this = MkRelevantAccess(a, apos, e) }
+
+          RelevantTarget getTarget() { result = MkRelevantTarget(a.getTarget(e), apos) }
+
+          pragma[nomagic]
+          Type getTypeAt(TypePath path) { result = a.getInferredType(e, apos, path) }
+
+          string toString() { result = a.toString() + ", " + apos.toString() }
+
+          Location getLocation() { result = a.getLocation() }
+        }
+
+        private module SatisfiesParameterConstraintInput implements
+          SatisfiesConstraintInputSig<RelevantAccess, RelevantTarget>
+        {
+          predicate relevantConstraint(RelevantAccess at, RelevantTarget constraint) {
+            constraint = at.getTarget()
+          }
+        }
+
+        private module SatisfiesParameterConstraint =
+          SatisfiesConstraint<RelevantAccess, RelevantTarget, SatisfiesParameterConstraintInput>;
+
         /**
-         * Holds if `baseMention` is a (transitive) base type mention of the
-         * type of `a` at position `apos` at path `pathToSub` in environment
-         * `e`, and `t` is mentioned (implicitly) at `path` inside `base`.
+         * Holds if the (transitive) base type `t` at `path` of `a` in environment `e`
+         * for some `AccessPosition` matches the type parameter `tp`, which is used in
+         * the declared types of `target`.
          *
          * For example, in
          *
          * ```csharp
          * class C<T1> { }
          *
-         * class Base<T2> { }
+         * class Base<T2> {
+         * //         ^^ `tp`
+         *     public C<T2> Method() { ... }
+         * //               ^^^^^^ `target`
+         * }
          *
          * class Mid<T3> : Base<C<T3>> { }
          *
          * class Sub<T4> : Mid<C<T4>> { }
          *
-         *     new Sub<int>().ToString();
-         * //  ^^^^^^^^^^^^^^ node at `apos`
-         * //  ^^^^^^^^^^^^^^^^^^^^^^^^^ `a`
+         *    new Sub<int>().Method(); // Note: `Sub<int>` is a subtype of `Base<C<C<int>>>`
+         * // ^^^^^^^^^^^^^^^^^^^^^^^ `a`
          * ```
          *
-         * where the method call is an access, `new Sub<int>()` is at the access
-         * position which is the receiver of a method call, and `pathToSub` is
-         * `""` we have:
+         * we have that type parameter `T2` of `Base` is matched as follows:
          *
-         * `baseMention` | `path`       | `t`
-         * ------------- | ------------ | ---
-         * `Mid<C<T4>>`  | `"T3"`       | ``C`1``
-         * `Mid<C<T4>>`  | `"T3.T1"`    | `int`
-         * `Base<C<T3>>` | `"T2"`       | ``C`1``
-         * `Base<C<T3>>` | `"T2.T1"`    | ``C`1``
-         * `Base<C<T3>>` | `"T2.T1.T1"` | `int`
+         * `path`    | `t`
+         * --------- | -------
+         * `""`      | ``C`1``
+         * `"T1"`    | ``C`1``
+         * `"T1.T1"` | `int`
          */
-        predicate hasBaseTypeMention(
-          Access a, AccessEnvironment e, AccessPosition apos, TypeMention baseMention,
-          TypePath path, Type t
+        pragma[nomagic]
+        predicate baseTypeMatch(
+          Access a, AccessEnvironment e, Declaration target, TypePath path, Type t, TypeParameter tp
         ) {
-          relevantAccess(a, e, apos, getTypeMentionRoot(baseMention)) and
-          exists(Type sub | sub = a.getInferredType(e, apos, TypePath::nil()) |
-            baseTypeMentionHasNonTypeParameterAt(sub, baseMention, path, t)
-            or
-            exists(TypePath prefix, TypePath suffix, TypeParameter tp |
-              baseTypeMentionHasTypeParameterAt(sub, baseMention, prefix, tp) and
-              t = inferTypeAt(a, e, apos, tp, suffix) and
-              path = prefix.append(suffix)
-            )
+          exists(AccessPosition apos, TypePath pathToTp |
+            argRootTypeSatisfiesTargetTypeCand(_, a, e, target, apos, tp, pathToTp) and
+            SatisfiesParameterConstraint::satisfiesConstraint(MkRelevantAccess(a, apos, e),
+              MkRelevantTarget(target, apos), pathToTp.appendInverse(path), t)
           )
         }
       }
@@ -1683,77 +1630,6 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         }
       }
 
-      /**
-       * Holds if the type of `a` at `apos` in environment `e` has the base type `base`,
-       * and when viewed as an element of that type has the type `t` at `path`.
-       */
-      pragma[nomagic]
-      private predicate accessBaseType(
-        Access a, AccessEnvironment e, AccessPosition apos, Type base, TypePath path, Type t
-      ) {
-        exists(TypeMention tm |
-          AccessBaseType::hasBaseTypeMention(a, e, apos, tm, path, t) and
-          base = getTypeMentionRoot(tm)
-        )
-      }
-
-      /**
-       * Holds if the declared type at `decl` for `dpos` at the `path` is `tp`
-       * and `path` starts with a type parameter of `base`.
-       */
-      pragma[nomagic]
-      private predicate declarationBaseType(
-        Declaration decl, DeclarationPosition dpos, Type base, TypePath path, TypeParameter tp
-      ) {
-        tp = decl.getDeclaredType(dpos, path) and
-        base.getATypeParameter() = path.getHead()
-      }
-
-      /**
-       * Holds if the (transitive) base type `t` at `path` of `a` in environment `e`
-       * for some `AccessPosition` matches the type parameter `tp`, which is used in
-       * the declared types of `target`.
-       *
-       * For example, in
-       *
-       * ```csharp
-       * class C<T1> { }
-       *
-       * class Base<T2> {
-       * //         ^^ `tp`
-       *     public C<T2> Method() { ... }
-       * //               ^^^^^^ `target`
-       * }
-       *
-       * class Mid<T3> : Base<C<T3>> { }
-       *
-       * class Sub<T4> : Mid<C<T4>> { }
-       *
-       *    new Sub<int>().Method(); // Note: `Sub<int>` is a subtype of `Base<C<C<int>>>`
-       * // ^^^^^^^^^^^^^^^^^^^^^^^ `a`
-       * ```
-       *
-       * we have that type parameter `T2` of `Base` is matched as follows:
-       *
-       * `path`    | `t`
-       * --------- | -------
-       * `""`      | ``C`1``
-       * `"T1"`    | ``C`1``
-       * `"T1.T1"` | `int`
-       */
-      pragma[nomagic]
-      private predicate baseTypeMatch(
-        Access a, AccessEnvironment e, Declaration target, TypePath path, Type t, TypeParameter tp
-      ) {
-        not exists(getTypeArgument(a, target, tp, _)) and
-        target = a.getTarget(e) and
-        exists(AccessPosition apos, DeclarationPosition dpos, Type base, TypePath pathToTypeParam |
-          accessBaseType(a, e, apos, base, pathToTypeParam.appendInverse(path), t) and
-          declarationBaseType(target, dpos, base, pathToTypeParam, tp) and
-          accessDeclarationPositionMatch(apos, dpos)
-        )
-      }
-
       /**
        * Holds if for `a` and corresponding `target` in environment `e`, the type parameter
        * `tp` is matched by a type argument at the access with type `t` and type path
@@ -1838,8 +1714,8 @@ module Make1<LocationSig Location, InputSig1<Location> Input1> {
         // We can infer the type of `tp` from one of the access positions
         directTypeMatch(a, e, target, path, t, tp)
         or
-        // We can infer the type of `tp` by going up the type hiearchy
-        baseTypeMatch(a, e, target, path, t, tp)
+        // We can infer the type of `tp` by going up the type hierarchy
+        AccessBaseType::baseTypeMatch(a, e, target, path, t, tp)
         or
         // We can infer the type of `tp` by a type constraint
         typeConstraintBaseTypeMatch(a, e, target, path, t, tp)
diff --git a/shared/typeinference/qlpack.yml b/shared/typeinference/qlpack.yml
index 1db3c0e95ac..d7dbeae2e09 100644
--- a/shared/typeinference/qlpack.yml
+++ b/shared/typeinference/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typeinference
-version: 0.0.31-dev
+version: 0.0.32-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typetracking/CHANGELOG.md b/shared/typetracking/CHANGELOG.md
index ecdded5ceda..313862d5bc7 100644
--- a/shared/typetracking/CHANGELOG.md
+++ b/shared/typetracking/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.34
+
+No user-facing changes.
+
 ## 2.0.33
 
 No user-facing changes.
diff --git a/shared/typetracking/change-notes/released/2.0.34.md b/shared/typetracking/change-notes/released/2.0.34.md
new file mode 100644
index 00000000000..fd170d38ce6
--- /dev/null
+++ b/shared/typetracking/change-notes/released/2.0.34.md
@@ -0,0 +1,3 @@
+## 2.0.34
+
+No user-facing changes.
diff --git a/shared/typetracking/codeql-pack.release.yml b/shared/typetracking/codeql-pack.release.yml
index 92e23200b4d..339a3ce7c57 100644
--- a/shared/typetracking/codeql-pack.release.yml
+++ b/shared/typetracking/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.33
+lastReleaseVersion: 2.0.34
diff --git a/shared/typetracking/qlpack.yml b/shared/typetracking/qlpack.yml
index 436b35815f0..891f8d0b1b1 100644
--- a/shared/typetracking/qlpack.yml
+++ b/shared/typetracking/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typetracking
-version: 2.0.34-dev
+version: 2.0.35-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/typos/CHANGELOG.md b/shared/typos/CHANGELOG.md
index 617fa5638b4..5838cd3c535 100644
--- a/shared/typos/CHANGELOG.md
+++ b/shared/typos/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.50
+
+No user-facing changes.
+
 ## 1.0.49
 
 No user-facing changes.
diff --git a/shared/typos/change-notes/released/1.0.50.md b/shared/typos/change-notes/released/1.0.50.md
new file mode 100644
index 00000000000..c1e5becd9fc
--- /dev/null
+++ b/shared/typos/change-notes/released/1.0.50.md
@@ -0,0 +1,3 @@
+## 1.0.50
+
+No user-facing changes.
diff --git a/shared/typos/codeql-pack.release.yml b/shared/typos/codeql-pack.release.yml
index 596617977df..856137cc5db 100644
--- a/shared/typos/codeql-pack.release.yml
+++ b/shared/typos/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.49
+lastReleaseVersion: 1.0.50
diff --git a/shared/typos/qlpack.yml b/shared/typos/qlpack.yml
index 4057cfb5784..b4705122b0a 100644
--- a/shared/typos/qlpack.yml
+++ b/shared/typos/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/typos
-version: 1.0.50-dev
+version: 1.0.51-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/shared/util/CHANGELOG.md b/shared/util/CHANGELOG.md
index 51488029e96..24a4f7d09a2 100644
--- a/shared/util/CHANGELOG.md
+++ b/shared/util/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 2.0.37
+
+No user-facing changes.
+
 ## 2.0.36
 
 No user-facing changes.
diff --git a/shared/util/change-notes/released/2.0.37.md b/shared/util/change-notes/released/2.0.37.md
new file mode 100644
index 00000000000..7d0b67a34af
--- /dev/null
+++ b/shared/util/change-notes/released/2.0.37.md
@@ -0,0 +1,3 @@
+## 2.0.37
+
+No user-facing changes.
diff --git a/shared/util/codeql-pack.release.yml b/shared/util/codeql-pack.release.yml
index 7e4aaa0dd67..108259a7400 100644
--- a/shared/util/codeql-pack.release.yml
+++ b/shared/util/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 2.0.36
+lastReleaseVersion: 2.0.37
diff --git a/shared/util/codeql/util/DenseRank.qll b/shared/util/codeql/util/DenseRank.qll
index 89ab865e959..6521bcec21b 100644
--- a/shared/util/codeql/util/DenseRank.qll
+++ b/shared/util/codeql/util/DenseRank.qll
@@ -55,13 +55,33 @@ signature module DenseRankInputSig {
 module DenseRank<DenseRankInputSig Input> {
   private import Input
 
+  private int getARank() { result = getRank(_) }
+
+  pragma[noinline]
+  private int getARankGap() { result = getARank() and not result - 1 = getARank() }
+
+  pragma[noinline]
+  private predicate isDenseFrom(int i) { i = unique( | | getARankGap()) }
+
+  pragma[noinline]
+  private int getRankNeedsDenseRank(Ranked r) { result = getRank(r) and not isDenseFrom(_) }
+
   private int rankRank(Ranked r, int rnk) {
-    rnk = getRank(r) and
-    rnk = rank[result](int rnk0 | rnk0 = getRank(_) | rnk0)
+    rnk = getRankNeedsDenseRank(r) and
+    rnk = rank[result](int rnk0 | rnk0 = getRankNeedsDenseRank(_) | rnk0)
   }
 
   /** Gets the `Ranked` value for which the dense rank is `rnk`. */
-  Ranked denseRank(int rnk) { rnk = rankRank(result, getRank(result)) }
+  pragma[nomagic]
+  Ranked denseRank(int rnk) {
+    rnk = rankRank(result, getRankNeedsDenseRank(result))
+    or
+    exists(int i, int offset |
+      isDenseFrom(i) and
+      offset = i - 1 and
+      rnk = getRank(result) - offset
+    )
+  }
 }
 
 /** Provides the input to `DenseRank1`. */
@@ -82,16 +102,38 @@ signature module DenseRankInputSig1 {
 module DenseRank1<DenseRankInputSig1 Input> {
   private import Input
 
+  private int getARank(C c) { result = getRank(c, _) }
+
+  pragma[noinline]
+  private int getARankGap(C c) { result = getARank(c) and not result - 1 = getARank(c) }
+
+  pragma[noinline]
+  private predicate isDenseFrom(C c, int i) { i = unique( | | getARankGap(c)) }
+
+  pragma[noinline]
+  private int getRankNeedsDenseRank(C c, Ranked r) {
+    result = getRank(c, r) and not isDenseFrom(c, _)
+  }
+
   private int rankRank(C c, Ranked r, int rnk) {
-    rnk = getRank(c, r) and
-    rnk = rank[result](int rnk0 | rnk0 = getRank(c, _) | rnk0)
+    rnk = getRankNeedsDenseRank(c, r) and
+    rnk = rank[result](int rnk0 | rnk0 = getRankNeedsDenseRank(c, _) | rnk0)
   }
 
   /**
    * Gets the `Ranked` value for which the dense rank in the context provided by
    * `c` is `rnk`.
    */
-  Ranked denseRank(C c, int rnk) { rnk = rankRank(c, result, getRank(c, result)) }
+  pragma[nomagic]
+  Ranked denseRank(C c, int rnk) {
+    rnk = rankRank(c, result, getRankNeedsDenseRank(c, result))
+    or
+    exists(int i, int offset |
+      isDenseFrom(c, i) and
+      offset = i - 1 and
+      rnk = getRank(c, result) - offset
+    )
+  }
 }
 
 /** Provides the input to `DenseRank2`. */
@@ -116,16 +158,38 @@ signature module DenseRankInputSig2 {
 module DenseRank2<DenseRankInputSig2 Input> {
   private import Input
 
+  private int getARank(C1 c1, C2 c2) { result = getRank(c1, c2, _) }
+
+  pragma[noinline]
+  private int getARankGap(C1 c1, C2 c2) {
+    result = getARank(c1, c2) and not result - 1 = getARank(c1, c2)
+  }
+
+  pragma[noinline]
+  private predicate isDenseFrom(C1 c1, C2 c2, int i) { i = unique( | | getARankGap(c1, c2)) }
+
+  pragma[noinline]
+  private int getRankNeedsDenseRank(C1 c1, C2 c2, Ranked r) {
+    result = getRank(c1, c2, r) and not isDenseFrom(c1, c2, _)
+  }
+
   private int rankRank(C1 c1, C2 c2, Ranked r, int rnk) {
-    rnk = getRank(c1, c2, r) and
-    rnk = rank[result](int rnk0 | rnk0 = getRank(c1, c2, _) | rnk0)
+    rnk = getRankNeedsDenseRank(c1, c2, r) and
+    rnk = rank[result](int rnk0 | rnk0 = getRankNeedsDenseRank(c1, c2, _) | rnk0)
   }
 
   /**
    * Gets the `Ranked` value for which the dense rank in the context provided by
    * `c1` and `c2` is `rnk`.
    */
+  pragma[nomagic]
   Ranked denseRank(C1 c1, C2 c2, int rnk) {
-    rnk = rankRank(c1, c2, result, getRank(c1, c2, result))
+    rnk = rankRank(c1, c2, result, getRankNeedsDenseRank(c1, c2, result))
+    or
+    exists(int i, int offset |
+      isDenseFrom(c1, c2, i) and
+      offset = i - 1 and
+      rnk = getRank(c1, c2, result) - offset
+    )
   }
 }
diff --git a/shared/util/qlpack.yml b/shared/util/qlpack.yml
index cff240056a4..6190a3b4275 100644
--- a/shared/util/qlpack.yml
+++ b/shared/util/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/util
-version: 2.0.37-dev
+version: 2.0.38-dev
 groups: shared
 library: true
 dependencies: null
diff --git a/shared/xml/CHANGELOG.md b/shared/xml/CHANGELOG.md
index 9f60f66ff72..96dfbcadf56 100644
--- a/shared/xml/CHANGELOG.md
+++ b/shared/xml/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.50
+
+No user-facing changes.
+
 ## 1.0.49
 
 No user-facing changes.
diff --git a/shared/xml/change-notes/released/1.0.50.md b/shared/xml/change-notes/released/1.0.50.md
new file mode 100644
index 00000000000..c1e5becd9fc
--- /dev/null
+++ b/shared/xml/change-notes/released/1.0.50.md
@@ -0,0 +1,3 @@
+## 1.0.50
+
+No user-facing changes.
diff --git a/shared/xml/codeql-pack.release.yml b/shared/xml/codeql-pack.release.yml
index 596617977df..856137cc5db 100644
--- a/shared/xml/codeql-pack.release.yml
+++ b/shared/xml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.49
+lastReleaseVersion: 1.0.50
diff --git a/shared/xml/qlpack.yml b/shared/xml/qlpack.yml
index 748ac73e0f8..c8e51461dae 100644
--- a/shared/xml/qlpack.yml
+++ b/shared/xml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/xml
-version: 1.0.50-dev
+version: 1.0.51-dev
 groups: shared
 library: true
 dependencies:
diff --git a/shared/yaml/CHANGELOG.md b/shared/yaml/CHANGELOG.md
index a13e3308874..e006acbeb21 100644
--- a/shared/yaml/CHANGELOG.md
+++ b/shared/yaml/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.0.50
+
+No user-facing changes.
+
 ## 1.0.49
 
 No user-facing changes.
diff --git a/shared/yaml/change-notes/released/1.0.50.md b/shared/yaml/change-notes/released/1.0.50.md
new file mode 100644
index 00000000000..c1e5becd9fc
--- /dev/null
+++ b/shared/yaml/change-notes/released/1.0.50.md
@@ -0,0 +1,3 @@
+## 1.0.50
+
+No user-facing changes.
diff --git a/shared/yaml/codeql-pack.release.yml b/shared/yaml/codeql-pack.release.yml
index 596617977df..856137cc5db 100644
--- a/shared/yaml/codeql-pack.release.yml
+++ b/shared/yaml/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.0.49
+lastReleaseVersion: 1.0.50
diff --git a/shared/yaml/qlpack.yml b/shared/yaml/qlpack.yml
index 54d582bb9fa..c499501ab26 100644
--- a/shared/yaml/qlpack.yml
+++ b/shared/yaml/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/yaml
-version: 1.0.50-dev
+version: 1.0.51-dev
 groups: shared
 library: true
 warnOnImplicitThis: true
diff --git a/swift/ql/lib/CHANGELOG.md b/swift/ql/lib/CHANGELOG.md
index e7979dbf0ed..01461fd5bfe 100644
--- a/swift/ql/lib/CHANGELOG.md
+++ b/swift/ql/lib/CHANGELOG.md
@@ -1,3 +1,9 @@
+## 6.6.0
+
+### New Features
+
+* The `TypeDecl` class now defines a `getDeclaredInterfaceType` predicate, which yields the declared interface type of the type declaration.
+
 ## 6.5.0
 
 ### New Features
diff --git a/swift/ql/lib/change-notes/2026-05-11-declared-interface-type.md b/swift/ql/lib/change-notes/released/6.6.0.md
similarity index 83%
rename from swift/ql/lib/change-notes/2026-05-11-declared-interface-type.md
rename to swift/ql/lib/change-notes/released/6.6.0.md
index c62130ee099..98de23680a3 100644
--- a/swift/ql/lib/change-notes/2026-05-11-declared-interface-type.md
+++ b/swift/ql/lib/change-notes/released/6.6.0.md
@@ -1,4 +1,5 @@
----
-category: feature
----
+## 6.6.0
+
+### New Features
+
 * The `TypeDecl` class now defines a `getDeclaredInterfaceType` predicate, which yields the declared interface type of the type declaration.
diff --git a/swift/ql/lib/codeql-pack.release.yml b/swift/ql/lib/codeql-pack.release.yml
index 2813c8e210f..4d7f31f2d8e 100644
--- a/swift/ql/lib/codeql-pack.release.yml
+++ b/swift/ql/lib/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 6.5.0
+lastReleaseVersion: 6.6.0
diff --git a/swift/ql/lib/qlpack.yml b/swift/ql/lib/qlpack.yml
index 921af77ca70..5e2f7c2942d 100644
--- a/swift/ql/lib/qlpack.yml
+++ b/swift/ql/lib/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-all
-version: 6.5.1-dev
+version: 6.6.1-dev
 groups: swift
 extractor: swift
 dbscheme: swift.dbscheme
diff --git a/swift/ql/src/CHANGELOG.md b/swift/ql/src/CHANGELOG.md
index f7b81101037..4bd8088718a 100644
--- a/swift/ql/src/CHANGELOG.md
+++ b/swift/ql/src/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.3.3
+
+No user-facing changes.
+
 ## 1.3.2
 
 No user-facing changes.
diff --git a/swift/ql/src/change-notes/released/1.3.3.md b/swift/ql/src/change-notes/released/1.3.3.md
new file mode 100644
index 00000000000..27a88ea0061
--- /dev/null
+++ b/swift/ql/src/change-notes/released/1.3.3.md
@@ -0,0 +1,3 @@
+## 1.3.3
+
+No user-facing changes.
diff --git a/swift/ql/src/codeql-pack.release.yml b/swift/ql/src/codeql-pack.release.yml
index 86a9cb32d86..eb1f7dabc84 100644
--- a/swift/ql/src/codeql-pack.release.yml
+++ b/swift/ql/src/codeql-pack.release.yml
@@ -1,2 +1,2 @@
 ---
-lastReleaseVersion: 1.3.2
+lastReleaseVersion: 1.3.3
diff --git a/swift/ql/src/qlpack.yml b/swift/ql/src/qlpack.yml
index 5354c5ee4d5..da4df6ae6d9 100644
--- a/swift/ql/src/qlpack.yml
+++ b/swift/ql/src/qlpack.yml
@@ -1,5 +1,5 @@
 name: codeql/swift-queries
-version: 1.3.3-dev
+version: 1.3.4-dev
 groups:
   - swift
   - queries