From a32cfdab9fa07e079ef74a35c7da9390a0fbf5b3 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Mon, 27 Jan 2025 11:43:17 +0100
Subject: [PATCH 1/3] C++: Support mixed `typedef`s and `using`s

---
 cpp/ql/lib/semmle/code/cpp/TypedefType.qll |  6 +++---
 cpp/ql/lib/semmlecode.cpp.dbscheme         | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/cpp/ql/lib/semmle/code/cpp/TypedefType.qll b/cpp/ql/lib/semmle/code/cpp/TypedefType.qll
index dfea28e6b296..1e330842d09b 100644
--- a/cpp/ql/lib/semmle/code/cpp/TypedefType.qll
+++ b/cpp/ql/lib/semmle/code/cpp/TypedefType.qll
@@ -13,7 +13,7 @@ private import semmle.code.cpp.internal.ResolveClass
  * ```
  */
 class TypedefType extends UserType {
-  TypedefType() { usertypes(underlyingElement(this), _, [5, 14]) }
+  TypedefType() { usertypes(underlyingElement(this), _, 18) }
 
   /**
    * Gets the base type of this typedef type.
@@ -54,7 +54,7 @@ class TypedefType extends UserType {
  * ```
  */
 class CTypedefType extends TypedefType {
-  CTypedefType() { usertypes(underlyingElement(this), _, 5) }
+  CTypedefType() { usertype_alias_kind(underlyingElement(this), 0) }
 
   override string getAPrimaryQlClass() { result = "CTypedefType" }
 
@@ -70,7 +70,7 @@ class CTypedefType extends TypedefType {
  * ```
  */
 class UsingAliasTypedefType extends TypedefType {
-  UsingAliasTypedefType() { usertypes(underlyingElement(this), _, 14) }
+  UsingAliasTypedefType() { usertype_alias_kind(underlyingElement(this), 1) }
 
   override string getAPrimaryQlClass() { result = "UsingAliasTypedefType" }
 
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 59cb96ca6999..e594389175c0 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -776,7 +776,7 @@ case @usertype.kind of
 |  2 = @class
 |  3 = @union
 |  4 = @enum
-|  5 = @typedef                       // classic C: typedef typedef type name
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
 // ... 6 = @template deprecated
 |  7 = @template_parameter
 |  8 = @template_template_parameter
@@ -785,10 +785,11 @@ case @usertype.kind of
 // ... 11 objc_protocol deprecated
 // ... 12 objc_category deprecated
 | 13 = @scoped_enum
-| 14 = @using_alias                  // a using name = type style typedef
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
 | 15 = @template_struct
 | 16 = @template_class
 | 17 = @template_union
+| 18 = @alias
 ;
 */
 
@@ -811,6 +812,17 @@ usertype_uuid(
     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
 );

From f49d8209e52c3710eb5bfd53c1b7ea424b8bb13a Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Mon, 27 Jan 2025 12:01:04 +0100
Subject: [PATCH 2/3] C++: Add upgrade and downgrade scripts

---
 .../old.dbscheme                              | 2444 +++++++++++++++++
 .../semmlecode.cpp.dbscheme                   | 2432 ++++++++++++++++
 .../upgrade.properties                        |    4 +
 .../usertypes.ql                              |   20 +
 .../old.dbscheme                              | 2432 ++++++++++++++++
 .../semmlecode.cpp.dbscheme                   | 2444 +++++++++++++++++
 .../upgrade.properties                        |    4 +
 .../usertype_alias_kind.ql                    |   14 +
 .../usertypes.ql                              |   10 +
 9 files changed, 9804 insertions(+)
 create mode 100644 cpp/downgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/old.dbscheme
 create mode 100644 cpp/downgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/semmlecode.cpp.dbscheme
 create mode 100644 cpp/downgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/upgrade.properties
 create mode 100644 cpp/downgrades/e594389175c098d7225683d0fd8cefcc47d84bc1/usertypes.ql
 create mode 100644 cpp/ql/lib/upgrades/59cb96ca699929b63941e81905f9b8de7eed59a6/old.dbscheme
 create mode 100644 cpp/ql/lib/upgrades/59cb96ca699929b63941e81905f9b8de7eed59a6/semmlecode.cpp.dbscheme
 create mode 100644 cpp/ql/lib/upgrades/59cb96ca699929b63941e81905f9b8de7eed59a6/upgrade.properties
 create mode 100644 cpp/ql/lib/upgrades/59cb96ca699929b63941e81905f9b8de7eed59a6/usertype_alias_kind.ql
 create mode 100644 cpp/ql/lib/upgrades/59cb96ca699929b63941e81905f9b8de7eed59a6/usertypes.ql

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

From 37b67dd9eba789f6b9c1591263696276ed169758 Mon Sep 17 00:00:00 2001
From: Jeroen Ketema <jketema@github.com>
Date: Mon, 27 Jan 2025 15:42:35 +0100
Subject: [PATCH 3/3] C++: Update stats file

---
 cpp/ql/lib/semmlecode.cpp.dbscheme.stats | 1998 +++++++++++-----------
 1 file changed, 1023 insertions(+), 975 deletions(-)

diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 72343fe01872..5f0f15438374 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -18,15 +18,15 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>31650399</v>
+            <v>31650404</v>
         </e>
         <e>
             <k>@location_stmt</k>
-            <v>5202909</v>
+            <v>5202910</v>
         </e>
         <e>
             <k>@location_expr</k>
-            <v>17958939</v>
+            <v>17958942</v>
         </e>
         <e>
             <k>@diagnostic</k>
@@ -42,27 +42,27 @@
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>40298958</v>
+            <v>40298943</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
-            <v>314185</v>
+            <v>314182</v>
         </e>
         <e>
             <k>@function</k>
-            <v>3356878</v>
+            <v>3356850</v>
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>3388842</v>
+            <v>3388814</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>6734233</v>
+            <v>6734234</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>1891254</v>
+            <v>1890757</v>
         </e>
         <e>
             <k>@namespace_decl</k>
@@ -70,7 +70,7 @@
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>106023</v>
+            <v>333243</v>
         </e>
         <e>
             <k>@using_directive</k>
@@ -86,7 +86,7 @@
         </e>
         <e>
             <k>@parameter</k>
-            <v>4798873</v>
+            <v>4798833</v>
         </e>
         <e>
             <k>@membervariable</k>
@@ -94,7 +94,7 @@
         </e>
         <e>
             <k>@globalvariable</k>
-            <v>425544</v>
+            <v>425546</v>
         </e>
         <e>
             <k>@localvariable</k>
@@ -342,7 +342,7 @@
         </e>
         <e>
             <k>@routineptr</k>
-            <v>862687</v>
+            <v>862680</v>
         </e>
         <e>
             <k>@reference</k>
@@ -370,15 +370,15 @@
         </e>
         <e>
             <k>@usertype</k>
-            <v>4992105</v>
+            <v>4992117</v>
         </e>
         <e>
             <k>@mangledname</k>
-            <v>5808008</v>
+            <v>5808009</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>5507864</v>
+            <v>5507865</v>
         </e>
         <e>
             <k>@concept_template</k>
@@ -386,7 +386,7 @@
         </e>
         <e>
             <k>@routinetype</k>
-            <v>762069</v>
+            <v>762063</v>
         </e>
         <e>
             <k>@ptrtomember</k>
@@ -422,7 +422,7 @@
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>89559</v>
+            <v>89599</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
@@ -442,19 +442,19 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>599886</v>
+            <v>599880</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>883352</v>
+            <v>883302</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>11290144</v>
+            <v>11290145</v>
         </e>
         <e>
             <k>@namespace</k>
-            <v>11094</v>
+            <v>11095</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
@@ -462,15 +462,15 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>3258071</v>
+            <v>3258064</v>
         </e>
         <e>
             <k>@value</k>
-            <v>14099264</v>
+            <v>14099266</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>2336672</v>
+            <v>2336673</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -486,7 +486,7 @@
         </e>
         <e>
             <k>@parexpr</k>
-            <v>4895383</v>
+            <v>4895384</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -514,7 +514,7 @@
         </e>
         <e>
             <k>@preincrexpr</k>
-            <v>96450</v>
+            <v>96451</v>
         </e>
         <e>
             <k>@predecrexpr</k>
@@ -594,7 +594,7 @@
         </e>
         <e>
             <k>@geexpr</k>
-            <v>80993</v>
+            <v>80994</v>
         </e>
         <e>
             <k>@leexpr</k>
@@ -658,7 +658,7 @@
         </e>
         <e>
             <k>@orlogicalexpr</k>
-            <v>1203318</v>
+            <v>1203319</v>
         </e>
         <e>
             <k>@commaexpr</k>
@@ -670,7 +670,7 @@
         </e>
         <e>
             <k>@callexpr</k>
-            <v>302370</v>
+            <v>302410</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -690,7 +690,7 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>8226116</v>
+            <v>8226118</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
@@ -698,7 +698,7 @@
         </e>
         <e>
             <k>@runtime_alignof</k>
-            <v>61479</v>
+            <v>61478</v>
         </e>
         <e>
             <k>@expr_stmt</k>
@@ -706,7 +706,7 @@
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>6144496</v>
+            <v>6144464</v>
         </e>
         <e>
             <k>@type_operand</k>
@@ -718,11 +718,11 @@
         </e>
         <e>
             <k>@typescompexpr</k>
-            <v>765412</v>
+            <v>765413</v>
         </e>
         <e>
             <k>@literal</k>
-            <v>6101414</v>
+            <v>6101418</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -734,7 +734,7 @@
         </e>
         <e>
             <k>@temp_init</k>
-            <v>1076140</v>
+            <v>1075849</v>
         </e>
         <e>
             <k>@errorexpr</k>
@@ -742,11 +742,11 @@
         </e>
         <e>
             <k>@reference_to</k>
-            <v>2194483</v>
+            <v>2194465</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2657405</v>
+            <v>2657383</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
@@ -810,7 +810,7 @@
         </e>
         <e>
             <k>@new_expr</k>
-            <v>58257</v>
+            <v>58256</v>
         </e>
         <e>
             <k>@delete_expr</k>
@@ -818,19 +818,19 @@
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>26159</v>
+            <v>26214</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>438294</v>
+            <v>438290</v>
         </e>
         <e>
             <k>@braced_init_list</k>
-            <v>2335</v>
+            <v>2334</v>
         </e>
         <e>
             <k>@type_id</k>
-            <v>60405</v>
+            <v>60404</v>
         </e>
         <e>
             <k>@sizeof_pack</k>
@@ -938,7 +938,7 @@
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>142248</v>
+            <v>142247</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
@@ -946,7 +946,7 @@
         </e>
         <e>
             <k>@ctorfieldinit</k>
-            <v>259364</v>
+            <v>259362</v>
         </e>
         <e>
             <k>@ctordelegatinginit</k>
@@ -962,11 +962,11 @@
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>50223</v>
+            <v>50222</v>
         </e>
         <e>
             <k>@static_cast</k>
-            <v>335477</v>
+            <v>335478</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
@@ -986,7 +986,7 @@
         </e>
         <e>
             <k>@param_ref</k>
-            <v>177993</v>
+            <v>177918</v>
         </e>
         <e>
             <k>@noopexpr</k>
@@ -1090,7 +1090,7 @@
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>30772</v>
+            <v>30759</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1262,7 +1262,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>907884</v>
+            <v>907876</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1402,7 +1402,7 @@
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1515847</v>
+            <v>1515834</v>
         </e>
         <e>
             <k>@stmt_block</k>
@@ -1418,11 +1418,11 @@
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>896215</v>
+            <v>896207</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>441454</v>
+            <v>441450</v>
         </e>
         <e>
             <k>@stmt_asm</k>
@@ -1430,11 +1430,11 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>770891</v>
+            <v>770893</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>460249</v>
+            <v>460245</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1446,7 +1446,7 @@
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>28973</v>
+            <v>29027</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
@@ -1470,7 +1470,7 @@
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>47475</v>
+            <v>47521</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
@@ -1506,7 +1506,7 @@
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>241108</v>
+            <v>241109</v>
         </e>
         <e>
             <k>@ppd_endif</k>
@@ -1514,11 +1514,11 @@
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>401966</v>
+            <v>401967</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>3130380</v>
+            <v>3130381</v>
         </e>
         <e>
             <k>@ppd_undef</k>
@@ -1640,7 +1640,7 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1298221</cardinality>
+            <cardinality>1298224</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -2221,7 +2221,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>17394</v>
+                    <v>17489</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2267,17 +2267,17 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>189</v>
+                                    <v>203</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7924</v>
+                                    <v>8277</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>8033</v>
+                                    <v>7667</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2323,8 +2323,8 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1284</a>
-                                    <b>1285</b>
+                                    <a>1291</a>
+                                    <b>1292</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -2381,13 +2381,13 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>713</a>
-                                    <b>714</b>
+                                    <a>714</a>
+                                    <b>715</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>779</a>
-                                    <b>780</b>
+                                    <a>787</a>
+                                    <b>788</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -2404,27 +2404,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10905</v>
+                                    <v>10891</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3562</v>
+                                    <v>3806</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1476</v>
+                                    <v>1463</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>24</b>
-                                    <v>1327</v>
+                                    <b>662</b>
+                                    <v>1314</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>716</b>
-                                    <v>121</v>
+                                    <a>689</a>
+                                    <b>690</b>
+                                    <v>13</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2440,7 +2440,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17394</v>
+                                    <v>17489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2456,17 +2456,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14319</v>
+                                    <v>14414</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3061</v>
+                                    <v>3048</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>13</v>
+                                    <b>5</b>
+                                    <v>27</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2730,11 +2730,11 @@
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>11799</v>
+                    <v>11921</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>230</v>
+                    <v>243</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2780,17 +2780,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9780</v>
+                                    <v>9916</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1422</v>
+                                    <v>1354</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>34</b>
-                                    <v>596</v>
+                                    <b>42</b>
+                                    <v>650</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2811,7 +2811,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>745</v>
+                                    <v>867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2827,17 +2827,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27</v>
+                                    <v>40</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>13</v>
+                                    <v>27</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -2845,13 +2840,13 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
+                                    <a>7</a>
+                                    <b>8</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
+                                    <a>9</a>
+                                    <b>10</b>
                                     <v>27</v>
                                 </b>
                                 <b>
@@ -2860,43 +2855,38 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>19</a>
-                                    <b>20</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>22</a>
-                                    <b>23</b>
-                                    <v>13</v>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>27</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
-                                    <b>24</b>
+                                    <a>24</a>
+                                    <b>25</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>36</a>
-                                    <b>37</b>
+                                    <a>46</a>
+                                    <b>47</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>140</a>
-                                    <b>141</b>
+                                    <a>128</a>
+                                    <b>129</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>271</a>
-                                    <b>272</b>
+                                    <a>275</a>
+                                    <b>276</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>320</a>
-                                    <b>321</b>
+                                    <a>306</a>
+                                    <b>307</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>322</a>
-                                    <b>323</b>
+                                    <a>331</a>
+                                    <b>332</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -2913,17 +2903,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27</v>
+                                    <v>40</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>13</v>
+                                    <v>27</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -2931,58 +2916,48 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>6</a>
-                                    <b>7</b>
-                                    <v>13</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>27</v>
-                                </b>
-                                <b>
-                                    <a>10</a>
-                                    <b>11</b>
+                                    <a>7</a>
+                                    <b>8</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>19</a>
-                                    <b>20</b>
-                                    <v>13</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>40</v>
                                 </b>
                                 <b>
-                                    <a>21</a>
-                                    <b>22</b>
-                                    <v>13</v>
+                                    <a>20</a>
+                                    <b>21</b>
+                                    <v>27</v>
                                 </b>
                                 <b>
-                                    <a>23</a>
-                                    <b>24</b>
+                                    <a>24</a>
+                                    <b>25</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>36</a>
-                                    <b>37</b>
+                                    <a>46</a>
+                                    <b>47</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>130</a>
-                                    <b>131</b>
+                                    <a>122</a>
+                                    <b>123</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>145</a>
-                                    <b>146</b>
+                                    <a>166</a>
+                                    <b>167</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>244</a>
-                                    <b>245</b>
+                                    <a>248</a>
+                                    <b>249</b>
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>264</a>
-                                    <b>265</b>
+                                    <a>252</a>
+                                    <b>253</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -4755,11 +4730,11 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>31650399</cardinality>
+            <cardinality>31650404</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>31650399</v>
+                    <v>31650404</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -4767,7 +4742,7 @@
                 </e>
                 <e>
                     <k>startLine</k>
-                    <v>7709298</v>
+                    <v>7709299</v>
                 </e>
                 <e>
                     <k>startColumn</k>
@@ -4775,7 +4750,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>7708625</v>
+                    <v>7708627</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -4793,7 +4768,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31650399</v>
+                                    <v>31650404</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4809,7 +4784,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31650399</v>
+                                    <v>31650404</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4825,7 +4800,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31650399</v>
+                                    <v>31650404</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4841,7 +4816,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31650399</v>
+                                    <v>31650404</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4857,7 +4832,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31650399</v>
+                                    <v>31650404</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5258,7 +5233,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5187072</v>
+                                    <v>5187073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5268,12 +5243,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>633852</v>
+                                    <v>633853</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>618379</v>
+                                    <v>618380</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -5294,7 +5269,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5247618</v>
+                                    <v>5247619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5330,7 +5305,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5929505</v>
+                                    <v>5929506</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5366,7 +5341,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7561431</v>
+                                    <v>7561432</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5387,12 +5362,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5256095</v>
+                                    <v>5256096</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>764363</v>
+                                    <v>764364</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -5803,7 +5778,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5183439</v>
+                                    <v>5183440</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5839,7 +5814,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5242909</v>
+                                    <v>5242910</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5875,7 +5850,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7548110</v>
+                                    <v>7548112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5896,7 +5871,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5929639</v>
+                                    <v>5929640</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5932,7 +5907,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5253135</v>
+                                    <v>5253136</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6282,11 +6257,11 @@
         </relation>
         <relation>
             <name>locations_stmt</name>
-            <cardinality>5202909</cardinality>
+            <cardinality>5202910</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5202909</v>
+                    <v>5202910</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -6320,7 +6295,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5202909</v>
+                                    <v>5202910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6336,7 +6311,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5202909</v>
+                                    <v>5202910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6352,7 +6327,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5202909</v>
+                                    <v>5202910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6368,7 +6343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5202909</v>
+                                    <v>5202910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -6384,7 +6359,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5202909</v>
+                                    <v>5202910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8274,11 +8249,11 @@
         </relation>
         <relation>
             <name>locations_expr</name>
-            <cardinality>17958939</cardinality>
+            <cardinality>17958942</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>17958939</v>
+                    <v>17958942</v>
                 </e>
                 <e>
                     <k>container</k>
@@ -8312,7 +8287,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17958939</v>
+                                    <v>17958942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8328,7 +8303,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17958939</v>
+                                    <v>17958942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8344,7 +8319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17958939</v>
+                                    <v>17958942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8360,7 +8335,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17958939</v>
+                                    <v>17958942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8376,7 +8351,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17958939</v>
+                                    <v>17958942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11368,7 +11343,7 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>5387447</cardinality>
+            <cardinality>5387460</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -11959,15 +11934,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>149742391</cardinality>
+            <cardinality>149742415</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24596917</v>
+                    <v>24596921</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3698100</v>
+                    <v>3698101</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11996,17 +11971,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>6573998</v>
+                                    <v>6574000</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>8708727</v>
+                                    <v>8708728</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>3552857</v>
+                                    <v>3552858</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -12032,7 +12007,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>743634</v>
+                                    <v>743635</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12087,15 +12062,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48676781</cardinality>
+            <cardinality>48676789</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7035608</v>
+                    <v>7035609</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3798617</v>
+                    <v>3798618</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12109,7 +12084,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3842146</v>
+                                    <v>3842147</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12225,11 +12200,11 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>40601042</cardinality>
+            <cardinality>40601028</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>40601042</v>
+                    <v>40601028</v>
                 </e>
                 <e>
                     <k>macro_id</k>
@@ -12237,7 +12212,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1070090</v>
+                    <v>1070092</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12255,7 +12230,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40601042</v>
+                                    <v>40601028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12271,7 +12246,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40601042</v>
+                                    <v>40601028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12287,7 +12262,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40601042</v>
+                                    <v>40601028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12431,12 +12406,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>426608</v>
+                                    <v>426609</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>252719</v>
+                                    <v>252746</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12446,7 +12421,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>77502</v>
+                                    <v>77475</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -12477,7 +12452,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1009643</v>
+                                    <v>1009645</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12498,7 +12473,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1070090</v>
+                                    <v>1070092</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12517,8 +12492,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>2974754</a>
-                                    <b>2974755</b>
+                                    <a>2974746</a>
+                                    <b>2974747</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -12571,15 +12546,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>35810800</cardinality>
+            <cardinality>35810829</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>35810800</v>
+                    <v>35810829</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>28059904</v>
+                    <v>28059915</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12593,7 +12568,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35810800</v>
+                                    <v>35810829</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12609,17 +12584,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21857862</v>
+                                    <v>21857859</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5174245</v>
+                                    <v>5174257</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>91</b>
-                                    <v>1027796</v>
+                                    <v>1027798</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12629,7 +12604,7 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>5543855</cardinality>
+            <cardinality>5543856</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -12637,7 +12612,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2758859</v>
+                    <v>2758860</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12651,7 +12626,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3056761</v>
+                                    <v>3056762</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12707,11 +12682,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>103251747</cardinality>
+            <cardinality>103251986</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>31225917</v>
+                    <v>31225989</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -12719,7 +12694,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>440263</v>
+                    <v>440264</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12733,22 +12708,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9979416</v>
+                                    <v>9979439</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12504994</v>
+                                    <v>12505023</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6395479</v>
+                                    <v>6395493</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2346026</v>
+                                    <v>2346032</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12764,22 +12739,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10213657</v>
+                                    <v>10213680</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12526493</v>
+                                    <v>12526522</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6195566</v>
+                                    <v>6195580</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2290199</v>
+                                    <v>2290205</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12852,7 +12827,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79994</v>
+                                    <v>79995</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -12913,7 +12888,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>311892</v>
+                                    <v>311893</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12933,11 +12908,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>103251747</cardinality>
+            <cardinality>103251986</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>31225917</v>
+                    <v>31225989</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -12959,22 +12934,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9979416</v>
+                                    <v>9979439</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12504994</v>
+                                    <v>12505023</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6395479</v>
+                                    <v>6395493</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>2346026</v>
+                                    <v>2346032</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12990,22 +12965,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13763049</v>
+                                    <v>13763081</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10789688</v>
+                                    <v>10789713</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5403961</v>
+                                    <v>5403974</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1269217</v>
+                                    <v>1269220</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13123,7 +13098,7 @@
                                 <b>
                                     <a>254</a>
                                     <b>990266</b>
-                                    <v>11961</v>
+                                    <v>11962</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13139,7 +13114,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>134778</v>
+                                    <v>134779</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13159,15 +13134,15 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>3356878</cardinality>
+            <cardinality>3356850</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3356878</v>
+                    <v>3356850</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>466659</v>
+                    <v>466655</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -13185,7 +13160,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3356878</v>
+                                    <v>3356850</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13201,7 +13176,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3356878</v>
+                                    <v>3356850</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13217,12 +13192,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>372700</v>
+                                    <v>372696</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31835</v>
+                                    <v>31834</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13248,7 +13223,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>465413</v>
+                                    <v>465409</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13365,15 +13340,15 @@
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1438643</cardinality>
+            <cardinality>1438631</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1433917</v>
+                    <v>1433905</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1438643</v>
+                    <v>1438631</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13387,7 +13362,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1429879</v>
+                                    <v>1429867</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13408,7 +13383,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1438643</v>
+                                    <v>1438631</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13418,15 +13393,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>3363194</cardinality>
+            <cardinality>3363165</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3356878</v>
+                    <v>3356850</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>631807</v>
+                    <v>631801</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13440,7 +13415,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3351078</v>
+                                    <v>3351050</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13461,12 +13436,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>436972</v>
+                                    <v>436968</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>120424</v>
+                                    <v>120423</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13767,33 +13742,33 @@
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>94416</cardinality>
+            <cardinality>94415</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>94416</v>
+                    <v>94415</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>55395</cardinality>
+            <cardinality>55394</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>55395</v>
+                    <v>55394</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>3352754</cardinality>
+            <cardinality>3352726</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3352754</v>
+                    <v>3352726</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -13873,15 +13848,15 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>674426</cardinality>
+            <cardinality>674420</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>674426</v>
+                    <v>674420</v>
                 </e>
                 <e>
                     <k>this_type</k>
-                    <v>233544</v>
+                    <v>233542</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13895,7 +13870,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>674426</v>
+                                    <v>674420</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13921,7 +13896,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>36518</v>
+                                    <v>36517</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -13946,27 +13921,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>3392752</cardinality>
+            <cardinality>3392723</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3388842</v>
+                    <v>3388814</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3232287</v>
+                    <v>3232260</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>600788</v>
+                    <v>600783</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>462019</v>
+                    <v>462015</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>932373</v>
+                    <v>932365</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13980,7 +13955,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3388842</v>
+                                    <v>3388814</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13996,7 +13971,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3385448</v>
+                                    <v>3385420</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14017,7 +13992,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3388842</v>
+                                    <v>3388814</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14033,7 +14008,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3388842</v>
+                                    <v>3388814</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14049,12 +14024,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3101895</v>
+                                    <v>3101869</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>7</b>
-                                    <v>130391</v>
+                                    <v>130390</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14070,7 +14045,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3221933</v>
+                                    <v>3221906</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14091,7 +14066,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3232287</v>
+                                    <v>3232260</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14107,12 +14082,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3146963</v>
+                                    <v>3146937</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>85323</v>
+                                    <v>85322</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14128,12 +14103,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>397059</v>
+                                    <v>397056</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>127255</v>
+                                    <v>127253</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14159,17 +14134,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>415404</v>
+                                    <v>415401</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>112733</v>
+                                    <v>112732</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>52285</v>
+                                    <v>52284</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -14190,7 +14165,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>472630</v>
+                                    <v>472627</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14221,17 +14196,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>441311</v>
+                                    <v>441307</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>90221</v>
+                                    <v>90220</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>51383</v>
+                                    <v>51382</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -14252,7 +14227,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347652</v>
+                                    <v>347650</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14262,7 +14237,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>37592</v>
+                                    <v>37591</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -14288,12 +14263,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>369349</v>
+                                    <v>369345</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>32050</v>
+                                    <v>32049</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14303,7 +14278,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>4900</b>
-                                    <v>25004</v>
+                                    <v>25003</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14319,7 +14294,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>427520</v>
+                                    <v>427516</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14340,7 +14315,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>355515</v>
+                                    <v>355512</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14371,17 +14346,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>736893</v>
+                                    <v>736887</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>90264</v>
+                                    <v>90263</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>13</b>
-                                    <v>70630</v>
+                                    <v>70629</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -14402,22 +14377,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>777793</v>
+                                    <v>777787</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>73251</v>
+                                    <v>73250</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>66</b>
-                                    <v>71017</v>
+                                    <v>71016</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>1516</b>
-                                    <v>10311</v>
+                                    <v>10310</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14433,7 +14408,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>854396</v>
+                                    <v>854388</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14459,7 +14434,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>884770</v>
+                                    <v>884763</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14474,11 +14449,11 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1592191</cardinality>
+            <cardinality>1592178</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1592191</v>
+                    <v>1592178</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -14507,7 +14482,7 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>1763134</cardinality>
+            <cardinality>1763135</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -14712,15 +14687,15 @@
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>178853</cardinality>
+            <cardinality>178851</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>178853</v>
+                    <v>178851</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>178251</v>
+                    <v>178336</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14734,7 +14709,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>178853</v>
+                                    <v>178851</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14750,12 +14725,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>177693</v>
+                                    <v>177863</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>558</v>
+                                    <v>472</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15035,11 +15010,11 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>4870878</cardinality>
+            <cardinality>4870837</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4870878</v>
+                    <v>4870837</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -15047,7 +15022,7 @@
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>2664665</v>
+                    <v>2664643</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15061,7 +15036,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4870878</v>
+                                    <v>4870837</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15077,7 +15052,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4870878</v>
+                                    <v>4870837</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15255,22 +15230,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1370805</v>
+                                    <v>1370794</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>667766</v>
+                                    <v>667761</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>449001</v>
+                                    <v>448997</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>21</b>
-                                    <v>177091</v>
+                                    <v>177090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15286,22 +15261,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1370805</v>
+                                    <v>1370794</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>667766</v>
+                                    <v>667761</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>449001</v>
+                                    <v>448997</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>21</b>
-                                    <v>177091</v>
+                                    <v>177090</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15311,15 +15286,15 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>6739211</cardinality>
+            <cardinality>6739212</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6734233</v>
+                    <v>6734234</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>6565780</v>
+                    <v>6565781</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -15331,7 +15306,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3605467</v>
+                    <v>3605468</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -15345,7 +15320,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6734233</v>
+                                    <v>6734234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15361,7 +15336,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6729255</v>
+                                    <v>6729256</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15382,7 +15357,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6734233</v>
+                                    <v>6734234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15398,7 +15373,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6734233</v>
+                                    <v>6734234</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15414,7 +15389,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6408494</v>
+                                    <v>6408495</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15435,7 +15410,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6551248</v>
+                                    <v>6551250</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15456,7 +15431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6548558</v>
+                                    <v>6548559</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15477,7 +15452,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6434730</v>
+                                    <v>6434731</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15786,7 +15761,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3120827</v>
+                                    <v>3120828</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15812,7 +15787,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3145718</v>
+                                    <v>3145719</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15864,7 +15839,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3594434</v>
+                                    <v>3594435</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16033,19 +16008,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>1891254</cardinality>
+            <cardinality>1890757</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1891254</v>
+                    <v>1890757</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1849353</v>
+                    <v>1849357</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1485508</v>
+                    <v>1485512</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16059,7 +16034,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1891254</v>
+                                    <v>1890757</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16075,7 +16050,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1891254</v>
+                                    <v>1890757</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16091,12 +16066,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1819279</v>
+                                    <v>1819567</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>24</b>
-                                    <v>30074</v>
+                                    <v>29789</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16112,7 +16087,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1820891</v>
+                                    <v>1820895</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16133,12 +16108,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1408507</v>
+                                    <v>1408984</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>651</b>
-                                    <v>77001</v>
+                                    <v>76527</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16154,7 +16129,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1410322</v>
+                                    <v>1410326</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16169,22 +16144,22 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>1297855</cardinality>
+            <cardinality>1297357</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1297855</v>
+                    <v>1297357</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>652211</cardinality>
+            <cardinality>652212</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>652211</v>
+                    <v>652212</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -16249,7 +16224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8187</v>
+                                    <v>8186</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16630,23 +16605,23 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>112481</cardinality>
+            <cardinality>338567</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>112481</v>
+                    <v>338567</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>106830</v>
+                    <v>65337</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>72117</v>
+                    <v>33921</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>269</v>
+                    <v>27</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16660,7 +16635,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>112481</v>
+                                    <v>338567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16676,7 +16651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>112481</v>
+                                    <v>338567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16692,7 +16667,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>112481</v>
+                                    <v>338567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16708,12 +16683,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105216</v>
+                                    <v>55420</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>22</b>
-                                    <v>1614</v>
+                                    <b>4</b>
+                                    <v>5608</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>134</b>
+                                    <v>4307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16729,12 +16709,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105216</v>
+                                    <v>55420</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>22</b>
-                                    <v>1614</v>
+                                    <b>4</b>
+                                    <v>5608</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>134</b>
+                                    <v>4307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16750,7 +16735,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>106830</v>
+                                    <v>65337</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16766,22 +16751,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>56913</v>
+                                    <v>26809</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>5516</v>
+                                    <v>2858</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>8476</v>
+                                    <b>145</b>
+                                    <v>2465</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>17</b>
-                                    <v>1210</v>
+                                    <a>145</a>
+                                    <b>289</b>
+                                    <v>1788</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16797,22 +16782,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>56913</v>
+                                    <v>26809</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>5516</v>
+                                    <v>2858</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>5</b>
-                                    <v>8476</v>
+                                    <b>145</b>
+                                    <v>2465</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>17</b>
-                                    <v>1210</v>
+                                    <a>145</a>
+                                    <b>289</b>
+                                    <v>1788</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16828,7 +16813,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72117</v>
+                                    <v>33921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16842,14 +16827,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>48</a>
-                                    <b>49</b>
-                                    <v>134</v>
+                                    <a>393</a>
+                                    <b>394</b>
+                                    <v>13</v>
                                 </b>
                                 <b>
-                                    <a>788</a>
-                                    <b>789</b>
-                                    <v>134</v>
+                                    <a>24599</a>
+                                    <b>24600</b>
+                                    <v>13</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16863,14 +16848,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>14</a>
-                                    <b>15</b>
-                                    <v>134</v>
+                                    <a>214</a>
+                                    <b>215</b>
+                                    <v>13</v>
                                 </b>
                                 <b>
-                                    <a>780</a>
-                                    <b>781</b>
-                                    <v>134</v>
+                                    <a>4609</a>
+                                    <b>4610</b>
+                                    <v>13</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16884,14 +16869,14 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>48</a>
-                                    <b>49</b>
-                                    <v>134</v>
+                                    <a>356</a>
+                                    <b>357</b>
+                                    <v>13</v>
                                 </b>
                                 <b>
-                                    <a>488</a>
-                                    <b>489</b>
-                                    <v>134</v>
+                                    <a>2148</a>
+                                    <b>2149</b>
+                                    <v>13</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16901,15 +16886,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>121841</cardinality>
+            <cardinality>732094</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>14048</v>
+                    <v>26484</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>72391</v>
+                    <v>338567</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16923,42 +16908,42 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5069</v>
+                                    <v>12327</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>300</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
                                     <b>4</b>
-                                    <v>1675</v>
+                                    <v>2438</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>1159</v>
+                                    <v>1598</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>3437</v>
+                                    <v>2899</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>30</b>
-                                    <v>1117</v>
+                                    <a>7</a>
+                                    <b>27</b>
+                                    <v>1991</v>
                                 </b>
                                 <b>
-                                    <a>31</a>
-                                    <b>45</b>
-                                    <v>1117</v>
+                                    <a>27</a>
+                                    <b>136</b>
+                                    <v>1002</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>276</b>
-                                    <v>171</v>
+                                    <a>145</a>
+                                    <b>146</b>
+                                    <v>3359</v>
+                                </b>
+                                <b>
+                                    <a>146</a>
+                                    <b>437</b>
+                                    <v>867</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16974,12 +16959,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68095</v>
+                                    <v>114174</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>31</b>
-                                    <v>4296</v>
+                                    <b>3</b>
+                                    <v>154259</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>25238</v>
+                                </b>
+                                <b>
+                                    <a>4</a>
+                                    <b>5</b>
+                                    <v>34233</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>65</b>
+                                    <v>10661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17597,15 +17597,15 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>4808540</cardinality>
+            <cardinality>4808499</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4798873</v>
+                    <v>4798833</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>2659166</v>
+                    <v>2659144</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -17613,7 +17613,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>862086</v>
+                    <v>862079</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17627,7 +17627,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4798873</v>
+                                    <v>4798833</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17643,7 +17643,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4798873</v>
+                                    <v>4798833</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17659,7 +17659,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4789550</v>
+                                    <v>4789510</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17680,22 +17680,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1392115</v>
+                                    <v>1392103</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>661150</v>
+                                    <v>661145</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>439592</v>
+                                    <v>439589</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>21</b>
-                                    <v>166308</v>
+                                    <v>166306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17711,22 +17711,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1392115</v>
+                                    <v>1392103</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>661150</v>
+                                    <v>661145</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>439592</v>
+                                    <v>439589</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>21</b>
-                                    <v>166308</v>
+                                    <v>166306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17742,22 +17742,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1481047</v>
+                                    <v>1481035</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>669914</v>
+                                    <v>669909</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>403847</v>
+                                    <v>403844</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>104356</v>
+                                    <v>104355</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18016,12 +18016,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>449173</v>
+                                    <v>449169</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>180013</v>
+                                    <v>180011</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18031,7 +18031,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>77762</v>
+                                    <v>77761</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -18041,7 +18041,7 @@
                                 <b>
                                     <a>15</a>
                                     <b>3702</b>
-                                    <v>36389</v>
+                                    <v>36388</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18057,12 +18057,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492093</v>
+                                    <v>492088</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>152345</v>
+                                    <v>152343</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18072,12 +18072,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>69384</v>
+                                    <v>69383</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>18</b>
-                                    <v>66248</v>
+                                    <v>66247</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -18098,17 +18098,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>634470</v>
+                                    <v>634465</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>187746</v>
+                                    <v>187744</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>17</b>
-                                    <v>39869</v>
+                                    <v>39868</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18352,7 +18352,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>502839</v>
+                                    <v>502840</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18372,15 +18372,15 @@
         </relation>
         <relation>
             <name>globalvariables</name>
-            <cardinality>425555</cardinality>
+            <cardinality>425557</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>425544</v>
+                    <v>425546</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1632</v>
+                    <v>1634</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -18398,7 +18398,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>425533</v>
+                                    <v>425535</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18419,7 +18419,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>425544</v>
+                                    <v>425546</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18435,7 +18435,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1145</v>
+                                    <v>1147</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18471,7 +18471,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1177</v>
+                                    <v>1179</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18507,12 +18507,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>399364</v>
+                                    <v>399362</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1044</b>
-                                    <v>5650</v>
+                                    <v>5652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18528,12 +18528,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>404351</v>
+                                    <v>404349</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>663</v>
+                                    <v>665</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18812,11 +18812,11 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>55894</cardinality>
+            <cardinality>55893</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>55894</v>
+                    <v>55893</v>
                 </e>
                 <e>
                     <k>function</k>
@@ -18834,7 +18834,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>55894</v>
+                                    <v>55893</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20739,7 +20739,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1389874</v>
+                                    <v>1389875</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21317,15 +21317,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>2175709</cardinality>
+            <cardinality>2175691</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2175709</v>
+                    <v>2175691</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>905392</v>
+                    <v>905385</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21339,7 +21339,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2175709</v>
+                                    <v>2175691</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21355,7 +21355,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>730535</v>
+                                    <v>730529</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21380,19 +21380,19 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>175650</cardinality>
+            <cardinality>175625</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>15374</v>
+                    <v>15417</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>161629</v>
+                    <v>161560</v>
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>11280</v>
+                    <v>11309</v>
                 </e>
                 <e>
                     <k>parentheses_would_change_meaning</k>
@@ -21410,27 +21410,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2137</v>
+                                    <v>2185</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6659</v>
+                                    <v>6656</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2162</v>
+                                    <v>2161</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1056</v>
+                                    <v>1055</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>9</b>
-                                    <v>1213</v>
+                                    <v>1212</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -21456,7 +21456,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15374</v>
+                                    <v>15417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21472,7 +21472,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15374</v>
+                                    <v>15417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21488,16 +21488,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148087</v>
+                                    <v>148024</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13063</v>
+                                    <v>13057</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
+                                    <b>5</b>
                                     <v>478</v>
                                 </b>
                             </bs>
@@ -21514,16 +21514,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>148087</v>
+                                    <v>148024</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13063</v>
+                                    <v>13057</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
+                                    <b>5</b>
                                     <v>478</v>
                                 </b>
                             </bs>
@@ -21540,7 +21540,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>161629</v>
+                                    <v>161560</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21556,12 +21556,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9787</v>
+                                    <v>9799</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1320</v>
+                                    <v>1336</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21582,12 +21582,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>965</v>
+                                    <v>981</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5504</v>
+                                    <v>5518</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21597,17 +21597,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1114</v>
+                                    <v>1113</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>949</v>
+                                    <v>948</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>41</b>
-                                    <v>858</v>
+                                    <v>857</v>
                                 </b>
                                 <b>
                                     <a>42</a>
@@ -21628,7 +21628,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11280</v>
+                                    <v>11309</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21647,8 +21647,8 @@
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>1861</a>
-                                    <b>1862</b>
+                                    <a>1867</a>
+                                    <b>1868</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -21689,8 +21689,8 @@
                                     <v>8</v>
                                 </b>
                                 <b>
-                                    <a>1365</a>
-                                    <b>1366</b>
+                                    <a>1369</a>
+                                    <b>1370</b>
                                     <v>8</v>
                                 </b>
                             </bs>
@@ -21701,19 +21701,19 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4992105</cardinality>
+            <cardinality>4992117</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4992105</v>
+                    <v>4992117</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1074912</v>
+                    <v>1074915</v>
                 </e>
                 <e>
                     <k>kind</k>
-                    <v>176</v>
+                    <v>162</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21727,7 +21727,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4992105</v>
+                                    <v>4992117</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21743,7 +21743,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4992105</v>
+                                    <v>4992117</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21759,7 +21759,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>742930</v>
+                                    <v>742932</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21790,12 +21790,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1007056</v>
+                                    <v>1007695</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>11</b>
-                                    <v>67856</v>
+                                    <b>10</b>
+                                    <v>67220</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21853,11 +21853,6 @@
                                     <b>20081</b>
                                     <v>13</v>
                                 </b>
-                                <b>
-                                    <a>36561</a>
-                                    <b>36562</b>
-                                    <v>13</v>
-                                </b>
                                 <b>
                                     <a>82457</a>
                                     <b>82458</b>
@@ -21869,8 +21864,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>114579</a>
-                                    <b>114580</b>
+                                    <a>151140</a>
+                                    <b>151141</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -21914,11 +21909,6 @@
                                     <b>833</b>
                                     <v>13</v>
                                 </b>
-                                <b>
-                                    <a>1287</a>
-                                    <b>1288</b>
-                                    <v>13</v>
-                                </b>
                                 <b>
                                     <a>1565</a>
                                     <b>1566</b>
@@ -21930,8 +21920,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>4449</a>
-                                    <b>4450</b>
+                                    <a>5585</a>
+                                    <b>5586</b>
                                     <v>13</v>
                                 </b>
                                 <b>
@@ -21957,11 +21947,11 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1631910</cardinality>
+            <cardinality>1631914</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1631910</v>
+                    <v>1631914</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -21983,7 +21973,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1631910</v>
+                                    <v>1631914</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21999,7 +21989,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1631910</v>
+                                    <v>1631914</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22255,13 +22245,71 @@
                 </dep>
             </dependencies>
         </relation>
+        <relation>
+            <name>usertype_alias_kind</name>
+            <cardinality>2175733</cardinality>
+            <columnsizes>
+                <e>
+                    <k>id</k>
+                    <v>2175691</v>
+                </e>
+                <e>
+                    <k>alias_kind</k>
+                    <v>85</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>id</src>
+                    <trg>alias_kind</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>2175648</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>42</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>alias_kind</src>
+                    <trg>id</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>21688</a>
+                                    <b>21689</b>
+                                    <v>42</v>
+                                </b>
+                                <b>
+                                    <a>28955</a>
+                                    <b>28956</b>
+                                    <v>42</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>966313</cardinality>
+            <cardinality>966305</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>966313</v>
+                    <v>966305</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -22276,7 +22324,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>27882</v>
+                    <v>27881</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22341,15 +22389,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>7780848</cardinality>
+            <cardinality>7780866</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7780848</v>
+                    <v>7780866</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>5325714</v>
+                    <v>5325726</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -22367,7 +22415,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7780848</v>
+                                    <v>7780866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22383,7 +22431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7780848</v>
+                                    <v>7780866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22399,12 +22447,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4731583</v>
+                                    <v>4731594</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>459568</v>
+                                    <v>459569</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22425,7 +22473,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5325714</v>
+                                    <v>5325726</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22477,55 +22525,55 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>747548</cardinality>
+            <cardinality>747542</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>747548</v>
+                    <v>747542</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1344633</cardinality>
+            <cardinality>1344636</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1344633</v>
+                    <v>1344636</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1611048</cardinality>
+            <cardinality>1611052</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1611048</v>
+                    <v>1611052</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>292181</cardinality>
+            <cardinality>292182</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>292181</v>
+                    <v>292182</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1327510</cardinality>
+            <cardinality>1327526</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1323608</v>
+                    <v>1323611</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -22543,12 +22591,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1320872</v>
+                                    <v>1320861</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>2736</v>
+                                    <v>2750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22584,22 +22632,22 @@
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>7681</v>
+                                    <v>7667</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>6908</v>
+                                    <v>6922</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>7410</v>
+                                    <v>7423</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>53</b>
-                                    <v>6936</v>
+                                    <v>6922</v>
                                 </b>
                                 <b>
                                     <a>53</a>
@@ -22614,11 +22662,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>3502871</cardinality>
+            <cardinality>3502880</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1631788</v>
+                    <v>1631792</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22626,7 +22674,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>1034651</v>
+                    <v>1034653</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22640,12 +22688,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>679137</v>
+                                    <v>679139</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>490292</v>
+                                    <v>490293</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22676,12 +22724,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>713696</v>
+                                    <v>713697</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>505641</v>
+                                    <v>505642</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22799,12 +22847,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>648833</v>
+                                    <v>648834</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>212416</v>
+                                    <v>212417</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22814,7 +22862,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>11</b>
-                                    <v>78829</v>
+                                    <v>78830</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -22835,7 +22883,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>912538</v>
+                                    <v>912540</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22855,11 +22903,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>643235</cardinality>
+            <cardinality>643229</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>259536</v>
+                    <v>259534</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22867,7 +22915,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>643063</v>
+                    <v>643057</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22881,12 +22929,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>196467</v>
+                                    <v>196466</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>54691</v>
+                                    <v>54690</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22907,7 +22955,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>186543</v>
+                                    <v>186541</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23050,7 +23098,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>642891</v>
+                                    <v>642886</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23071,7 +23119,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>643063</v>
+                                    <v>643057</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23134,11 +23182,11 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>5507864</cardinality>
+            <cardinality>5507865</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5507864</v>
+                    <v>5507865</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -23146,7 +23194,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5462042</v>
+                    <v>5462043</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -23164,7 +23212,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5507864</v>
+                                    <v>5507865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23180,7 +23228,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5507864</v>
+                                    <v>5507865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23196,7 +23244,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5507864</v>
+                                    <v>5507865</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23330,7 +23378,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5416220</v>
+                                    <v>5416221</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23351,7 +23399,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5416220</v>
+                                    <v>5416221</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23372,7 +23420,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5462042</v>
+                                    <v>5462043</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23441,15 +23489,15 @@
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>1226967</cardinality>
+            <cardinality>1226957</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1226967</v>
+                    <v>1226957</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>230193</v>
+                    <v>230191</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23463,7 +23511,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1226967</v>
+                                    <v>1226957</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23479,7 +23527,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>140014</v>
+                                    <v>140013</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23509,11 +23557,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>3133430</cardinality>
+            <cardinality>3133404</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1832653</v>
+                    <v>1832637</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23521,7 +23569,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>375793</v>
+                    <v>375790</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23535,22 +23583,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>987408</v>
+                                    <v>987399</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>521006</v>
+                                    <v>521002</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>216660</v>
+                                    <v>216658</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>107578</v>
+                                    <v>107577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23566,17 +23614,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1011553</v>
+                                    <v>1011544</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>518600</v>
+                                    <v>518596</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>213910</v>
+                                    <v>213908</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -23719,22 +23767,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>220397</v>
+                                    <v>220396</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>33210</v>
+                                    <v>33209</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>25219</v>
+                                    <v>25218</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>28570</v>
+                                    <v>28569</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -23765,7 +23813,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>323851</v>
+                                    <v>323848</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23775,7 +23823,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>11428</v>
+                                    <v>11427</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23785,11 +23833,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>570972</cardinality>
+            <cardinality>570967</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>248151</v>
+                    <v>248149</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23797,7 +23845,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>567578</v>
+                    <v>567573</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23811,7 +23859,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>190925</v>
+                                    <v>190923</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23837,7 +23885,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>182204</v>
+                                    <v>182202</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23990,7 +24038,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>564184</v>
+                                    <v>564179</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24011,7 +24059,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>567578</v>
+                                    <v>567573</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25222,11 +25270,11 @@
         </relation>
         <relation>
             <name>concept_template_argument</name>
-            <cardinality>121168</cardinality>
+            <cardinality>121167</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>81870</v>
+                    <v>81869</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25248,12 +25296,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49814</v>
+                                    <v>49813</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26452</v>
+                                    <v>26451</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25433,7 +25481,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19326</v>
+                                    <v>19325</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25495,7 +25543,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>66</v>
+                                    <v>65</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25584,15 +25632,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>762069</cardinality>
+            <cardinality>762063</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>762069</v>
+                    <v>762063</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>357963</v>
+                    <v>357960</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25606,7 +25654,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>762069</v>
+                                    <v>762063</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25622,7 +25670,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>295367</v>
+                                    <v>295365</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25632,7 +25680,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4676</b>
-                                    <v>18345</v>
+                                    <v>18344</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25724,7 +25772,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>40141</v>
+                                    <v>40142</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -26212,11 +26260,11 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>988076</cardinality>
+            <cardinality>988078</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>981492</v>
+                    <v>981495</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -26234,7 +26282,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>974909</v>
+                                    <v>974911</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26300,11 +26348,11 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>9758641</cardinality>
+            <cardinality>9758473</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>3343817</v>
+                    <v>3343789</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -26322,32 +26370,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>431945</v>
+                                    <v>431941</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>686412</v>
+                                    <v>686449</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1416732</v>
+                                    <v>1416678</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>458109</v>
+                                    <v>458148</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>233931</v>
+                                    <v>233886</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>116686</v>
+                                    <v>116685</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26441,8 +26489,8 @@
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>42406</a>
-                                    <b>42407</b>
+                                    <a>42404</a>
+                                    <b>42405</b>
                                     <v>42</v>
                                 </b>
                                 <b>
@@ -26463,11 +26511,11 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>2898033</cardinality>
+            <cardinality>2898034</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>2545002</v>
+                    <v>2545003</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -27132,11 +27180,11 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>99082</cardinality>
+            <cardinality>99123</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>99082</v>
+                    <v>99123</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27166,7 +27214,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99082</v>
+                                    <v>99123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27182,7 +27230,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99082</v>
+                                    <v>99123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27198,7 +27246,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99082</v>
+                                    <v>99123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27214,7 +27262,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99082</v>
+                                    <v>99123</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27243,8 +27291,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>6611</a>
-                                    <b>6612</b>
+                                    <a>6614</a>
+                                    <b>6615</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -27349,12 +27397,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77217</v>
+                                    <v>77177</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>6759</v>
+                                    <v>6800</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -27456,8 +27504,8 @@
                                     <v>13</v>
                                 </b>
                                 <b>
-                                    <a>6494</a>
-                                    <b>6495</b>
+                                    <a>6497</a>
+                                    <b>6498</b>
                                     <v>13</v>
                                 </b>
                             </bs>
@@ -27572,12 +27620,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>89369</v>
+                                    <v>89329</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>23</b>
-                                    <v>2573</v>
+                                    <v>2614</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27635,7 +27683,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>91387</v>
+                                    <v>91388</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27806,15 +27854,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>89559</cardinality>
+            <cardinality>89599</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>89559</v>
+                    <v>89599</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>89559</v>
+                    <v>89599</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27828,7 +27876,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>89559</v>
+                                    <v>89599</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27844,7 +27892,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>89559</v>
+                                    <v>89599</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28212,15 +28260,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>8350255</cardinality>
+            <cardinality>8350274</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>8350255</v>
+                    <v>8350274</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>4803694</v>
+                    <v>4803705</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28234,7 +28282,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8350255</v>
+                                    <v>8350274</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28250,12 +28298,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3203131</v>
+                                    <v>3203138</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1309004</v>
+                                    <v>1309007</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -28270,11 +28318,11 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4687084</cardinality>
+            <cardinality>4687174</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>562422</v>
+                    <v>562417</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -28282,7 +28330,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4569883</v>
+                    <v>4569973</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28296,7 +28344,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>233200</v>
+                                    <v>233198</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28311,17 +28359,17 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>37764</v>
+                                    <v>37763</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>47860</v>
+                                    <v>47859</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>11</b>
-                                    <v>43349</v>
+                                    <v>43348</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -28336,7 +28384,7 @@
                                 <b>
                                     <a>19</a>
                                     <b>53</b>
-                                    <v>42318</v>
+                                    <v>42317</v>
                                 </b>
                                 <b>
                                     <a>53</a>
@@ -28357,7 +28405,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>233071</v>
+                                    <v>233069</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28372,7 +28420,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>37850</v>
+                                    <v>37849</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -28397,7 +28445,7 @@
                                 <b>
                                     <a>19</a>
                                     <b>53</b>
-                                    <v>42318</v>
+                                    <v>42317</v>
                                 </b>
                                 <b>
                                     <a>53</a>
@@ -28451,7 +28499,7 @@
                                     <v>816</v>
                                 </b>
                                 <b>
-                                    <a>222</a>
+                                    <a>223</a>
                                     <b>328</b>
                                     <v>816</v>
                                 </b>
@@ -28555,7 +28603,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4569883</v>
+                                    <v>4569973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28571,12 +28619,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4482024</v>
+                                    <v>4482115</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>13</b>
-                                    <v>87858</v>
+                                    <v>87857</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28586,15 +28634,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>144783</cardinality>
+            <cardinality>144782</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>144783</v>
+                    <v>144782</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>89963</v>
+                    <v>89962</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28608,7 +28656,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>144783</v>
+                                    <v>144782</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28634,7 +28682,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>19376</v>
+                                    <v>19375</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -28649,15 +28697,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>599886</cardinality>
+            <cardinality>599880</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>599886</v>
+                    <v>599880</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>572475</v>
+                    <v>572471</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -28665,11 +28713,11 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>296054</v>
+                    <v>296052</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>44638</v>
+                    <v>44637</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28683,7 +28731,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599886</v>
+                                    <v>599880</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28699,7 +28747,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599886</v>
+                                    <v>599880</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28715,7 +28763,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599886</v>
+                                    <v>599880</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28731,7 +28779,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599886</v>
+                                    <v>599880</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28747,7 +28795,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>551639</v>
+                                    <v>551634</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28768,7 +28816,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>551639</v>
+                                    <v>551634</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28789,7 +28837,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>551639</v>
+                                    <v>551634</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28810,7 +28858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>551639</v>
+                                    <v>551634</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28970,7 +29018,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>283939</v>
+                                    <v>283937</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28991,7 +29039,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>283939</v>
+                                    <v>283937</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29012,7 +29060,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>295496</v>
+                                    <v>295493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29033,7 +29081,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>289524</v>
+                                    <v>289522</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29126,7 +29174,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44638</v>
+                                    <v>44637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29167,11 +29215,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>602120</cardinality>
+            <cardinality>602115</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>599327</v>
+                    <v>599322</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -29189,7 +29237,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>596534</v>
+                                    <v>596529</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29235,11 +29283,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>565945</cardinality>
+            <cardinality>565940</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>565945</v>
+                    <v>565940</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -29257,7 +29305,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>565945</v>
+                                    <v>565940</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29454,19 +29502,19 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>883352</cardinality>
+            <cardinality>883302</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>883352</v>
+                    <v>883302</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53488</v>
+                    <v>53487</v>
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>98169</v>
+                    <v>98039</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -29484,7 +29532,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>883352</v>
+                                    <v>883302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29500,7 +29548,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>883352</v>
+                                    <v>883302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29516,7 +29564,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>883352</v>
+                                    <v>883302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29532,12 +29580,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7819</v>
+                                    <v>7776</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17571</v>
+                                    <v>17614</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -29588,12 +29636,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7819</v>
+                                    <v>7776</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17571</v>
+                                    <v>17614</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -29665,17 +29713,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60749</v>
+                                    <v>60361</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7303</v>
+                                    <v>7647</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>7647</v>
+                                    <v>7561</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -29706,17 +29754,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60749</v>
+                                    <v>60361</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7303</v>
+                                    <v>7647</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>7647</v>
+                                    <v>7561</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -29747,7 +29795,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>97310</v>
+                                    <v>97180</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29772,7 +29820,7 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>20372</b>
+                                    <b>20371</b>
                                     <v>472</v>
                                 </b>
                             </bs>
@@ -29814,7 +29862,7 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>2132</b>
+                                    <b>2129</b>
                                     <v>429</v>
                                 </b>
                             </bs>
@@ -29825,19 +29873,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>11290144</cardinality>
+            <cardinality>11290145</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11290144</v>
+                    <v>11290145</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>4299059</v>
+                    <v>4299060</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11290144</v>
+                    <v>11290145</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29851,7 +29899,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11290144</v>
+                                    <v>11290145</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29867,7 +29915,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11290144</v>
+                                    <v>11290145</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29883,7 +29931,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3932686</v>
+                                    <v>3932687</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29909,7 +29957,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3932686</v>
+                                    <v>3932687</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29935,7 +29983,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11290144</v>
+                                    <v>11290145</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29951,7 +29999,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11290144</v>
+                                    <v>11290145</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29961,15 +30009,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3315383</cardinality>
+            <cardinality>3316594</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3261833</v>
+                    <v>3263044</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3172359</v>
+                    <v>3173570</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29983,7 +30031,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3230080</v>
+                                    <v>3231291</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30004,7 +30052,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3029335</v>
+                                    <v>3030546</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30019,15 +30067,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>9603746</cardinality>
+            <cardinality>9603748</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9603641</v>
+                    <v>9603643</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>9603746</v>
+                    <v>9603748</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30041,7 +30089,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9603536</v>
+                                    <v>9603537</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30062,7 +30110,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9603746</v>
+                                    <v>9603748</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30072,22 +30120,22 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>10714346</cardinality>
+            <cardinality>10714603</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10714346</v>
+                    <v>10714603</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1791784</cardinality>
+            <cardinality>1791768</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>1334394</v>
+                    <v>1334382</v>
                 </e>
                 <e>
                     <k>i</k>
@@ -30095,7 +30143,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1791784</v>
+                    <v>1791768</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30109,12 +30157,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>888212</v>
+                                    <v>888204</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>438894</v>
+                                    <v>438890</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30135,12 +30183,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>888212</v>
+                                    <v>888204</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>438894</v>
+                                    <v>438890</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30293,7 +30341,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1791784</v>
+                                    <v>1791768</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30309,7 +30357,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1791784</v>
+                                    <v>1791768</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30319,11 +30367,11 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>11094</cardinality>
+            <cardinality>11095</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11094</v>
+                    <v>11095</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -30341,7 +30389,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11094</v>
+                                    <v>11095</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30388,7 +30436,7 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2026141</cardinality>
+            <cardinality>2026146</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
@@ -30396,7 +30444,7 @@
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2026141</v>
+                    <v>2026146</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30486,7 +30534,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2026141</v>
+                                    <v>2026146</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30496,11 +30544,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19401299</cardinality>
+            <cardinality>19401302</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19401299</v>
+                    <v>19401302</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -30508,7 +30556,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12904789</v>
+                    <v>12904791</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30522,7 +30570,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19401299</v>
+                                    <v>19401302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30538,7 +30586,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19401299</v>
+                                    <v>19401302</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30656,12 +30704,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7374642</v>
+                                    <v>7374643</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5068854</v>
+                                    <v>5068855</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30682,12 +30730,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7374642</v>
+                                    <v>7374643</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5068854</v>
+                                    <v>5068855</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30702,11 +30750,11 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6961484</cardinality>
+            <cardinality>6961485</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6961484</v>
+                    <v>6961485</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -30791,11 +30839,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>6219955</cardinality>
+            <cardinality>6219922</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>6219955</v>
+                    <v>6219922</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -30813,7 +30861,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6219955</v>
+                                    <v>6219922</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30837,8 +30885,8 @@
                                     <v>23</v>
                                 </b>
                                 <b>
-                                    <a>268067</a>
-                                    <b>268068</b>
+                                    <a>268068</a>
+                                    <b>268069</b>
                                     <v>23</v>
                                 </b>
                             </bs>
@@ -30849,11 +30897,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>723403</cardinality>
+            <cardinality>723397</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>723403</v>
+                    <v>723397</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -30871,7 +30919,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723403</v>
+                                    <v>723397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30980,15 +31028,15 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>3258071</cardinality>
+            <cardinality>3258064</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3258071</v>
+                    <v>3258064</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>3258071</v>
+                    <v>3258064</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
@@ -30996,7 +31044,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>591864</v>
+                    <v>591859</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31010,7 +31058,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3258071</v>
+                                    <v>3258064</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31026,7 +31074,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3258071</v>
+                                    <v>3258064</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31042,7 +31090,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3258071</v>
+                                    <v>3258064</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31058,7 +31106,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3258071</v>
+                                    <v>3258064</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31074,7 +31122,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3258071</v>
+                                    <v>3258064</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31090,7 +31138,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3258071</v>
+                                    <v>3258064</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31106,7 +31154,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33832</v>
+                                    <v>33831</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31124,7 +31172,7 @@
                                     <v>3782</v>
                                 </b>
                                 <b>
-                                    <a>6806</a>
+                                    <a>6807</a>
                                     <b>41956</b>
                                     <v>115</v>
                                 </b>
@@ -31142,7 +31190,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33832</v>
+                                    <v>33831</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31160,7 +31208,7 @@
                                     <v>3782</v>
                                 </b>
                                 <b>
-                                    <a>6806</a>
+                                    <a>6807</a>
                                     <b>41956</b>
                                     <v>115</v>
                                 </b>
@@ -31209,17 +31257,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>85006</v>
+                                    <v>84982</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>40543</v>
+                                    <v>40565</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>427778</v>
+                                    <v>427774</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -31240,17 +31288,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>85006</v>
+                                    <v>84982</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>40543</v>
+                                    <v>40565</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>427778</v>
+                                    <v>427774</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -31271,7 +31319,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>119346</v>
+                                    <v>119345</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31281,7 +31329,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>445213</v>
+                                    <v>445209</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -31296,11 +31344,11 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>8226116</cardinality>
+            <cardinality>8226118</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>8226116</v>
+                    <v>8226118</v>
                 </e>
                 <e>
                     <k>var</k>
@@ -31318,7 +31366,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8226116</v>
+                                    <v>8226118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31389,15 +31437,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>6230380</cardinality>
+            <cardinality>6230323</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>6227727</v>
+                    <v>6227671</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>295540</v>
+                    <v>295537</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31411,7 +31459,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6225075</v>
+                                    <v>6225019</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31432,7 +31480,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>194321</v>
+                                    <v>194319</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -31462,11 +31510,11 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>57054</cardinality>
+            <cardinality>57053</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>57054</v>
+                    <v>57053</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -31488,7 +31536,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>57054</v>
+                                    <v>57053</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31504,7 +31552,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>57054</v>
+                                    <v>57053</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31879,11 +31927,11 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>14099264</cardinality>
+            <cardinality>14099266</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>14099264</v>
+                    <v>14099266</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -31901,7 +31949,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14099264</v>
+                                    <v>14099266</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32010,15 +32058,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>14484500</cardinality>
+            <cardinality>14484502</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>14099264</v>
+                    <v>14099266</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>14484500</v>
+                    <v>14484502</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32032,7 +32080,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13735595</v>
+                                    <v>13735597</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -32053,7 +32101,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14484500</v>
+                                    <v>14484502</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32490,11 +32538,11 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>2336672</cardinality>
+            <cardinality>2336673</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>2336672</v>
+                    <v>2336673</v>
                 </e>
                 <e>
                     <k>var</k>
@@ -32502,7 +32550,7 @@
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>2336672</v>
+                    <v>2336673</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -32520,7 +32568,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2336672</v>
+                                    <v>2336673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32536,7 +32584,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2336672</v>
+                                    <v>2336673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32552,7 +32600,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2336672</v>
+                                    <v>2336673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32641,7 +32689,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2336672</v>
+                                    <v>2336673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32657,7 +32705,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2336672</v>
+                                    <v>2336673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32673,7 +32721,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2336672</v>
+                                    <v>2336673</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32771,26 +32819,26 @@
         </relation>
         <relation>
             <name>braced_initialisers</name>
-            <cardinality>74303</cardinality>
+            <cardinality>74272</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>74303</v>
+                    <v>74272</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>1798195</cardinality>
+            <cardinality>1798179</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>1798195</v>
+                    <v>1798179</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>899974</v>
+                    <v>899966</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32804,7 +32852,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1798195</v>
+                                    <v>1798179</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32825,12 +32873,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>870869</v>
+                                    <v>870862</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>10793</v>
+                                    <v>10792</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32840,11 +32888,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25135882</cardinality>
+            <cardinality>25135886</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25135882</v>
+                    <v>25135886</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -32852,7 +32900,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11535482</v>
+                    <v>11535483</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32866,7 +32914,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25135882</v>
+                                    <v>25135886</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32882,7 +32930,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25135882</v>
+                                    <v>25135886</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33060,7 +33108,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9705672</v>
+                                    <v>9705673</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33091,7 +33139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9853414</v>
+                                    <v>9853416</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33111,15 +33159,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>907884</cardinality>
+            <cardinality>907876</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>907884</v>
+                    <v>907876</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>907884</v>
+                    <v>907876</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -33137,7 +33185,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>907884</v>
+                                    <v>907876</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33153,7 +33201,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>907884</v>
+                                    <v>907876</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33169,7 +33217,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>907884</v>
+                                    <v>907876</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33185,7 +33233,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>907884</v>
+                                    <v>907876</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33237,11 +33285,11 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25135882</cardinality>
+            <cardinality>25135886</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25135882</v>
+                    <v>25135886</v>
                 </e>
                 <e>
                     <k>typeid</k>
@@ -33263,7 +33311,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25135882</v>
+                                    <v>25135886</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33279,7 +33327,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25135882</v>
+                                    <v>25135886</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33424,11 +33472,11 @@
         </relation>
         <relation>
             <name>new_allocated_type</name>
-            <cardinality>58257</cardinality>
+            <cardinality>58256</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>58257</v>
+                    <v>58256</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -33446,7 +33494,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58257</v>
+                                    <v>58256</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33467,7 +33515,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>18259</v>
+                                    <v>18258</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34552,15 +34600,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>438294</cardinality>
+            <cardinality>438290</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>438294</v>
+                    <v>438290</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>438294</v>
+                    <v>438290</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34574,7 +34622,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438294</v>
+                                    <v>438290</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34590,7 +34638,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438294</v>
+                                    <v>438290</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34600,11 +34648,11 @@
         </relation>
         <relation>
             <name>typeid_bind</name>
-            <cardinality>60405</cardinality>
+            <cardinality>60404</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>60405</v>
+                    <v>60404</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -34622,7 +34670,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>60405</v>
+                                    <v>60404</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36317,11 +36365,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>6324267</cardinality>
+            <cardinality>6324268</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6324267</v>
+                    <v>6324268</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -36329,7 +36377,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2966232</v>
+                    <v>2966233</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36343,7 +36391,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6324267</v>
+                                    <v>6324268</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36359,7 +36407,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6324267</v>
+                                    <v>6324268</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36825,15 +36873,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>468505</cardinality>
+            <cardinality>468501</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>468505</v>
+                    <v>468501</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>468505</v>
+                    <v>468501</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36847,7 +36895,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>468505</v>
+                                    <v>468501</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36863,7 +36911,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>468505</v>
+                                    <v>468501</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37257,11 +37305,11 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>896215</cardinality>
+            <cardinality>896207</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>441454</v>
+                    <v>441450</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -37269,7 +37317,7 @@
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>896215</v>
+                    <v>896207</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37288,7 +37336,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>438363</v>
+                                    <v>438359</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -37314,7 +37362,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>438363</v>
+                                    <v>438359</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -37477,7 +37525,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>896215</v>
+                                    <v>896207</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37493,7 +37541,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>896215</v>
+                                    <v>896207</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37503,15 +37551,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>441454</cardinality>
+            <cardinality>441450</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>441454</v>
+                    <v>441450</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>441454</v>
+                    <v>441450</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37525,7 +37573,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>441454</v>
+                                    <v>441450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37541,7 +37589,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>441454</v>
+                                    <v>441450</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37743,11 +37791,11 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>5536443</cardinality>
+            <cardinality>5536444</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5536443</v>
+                    <v>5536444</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -37769,7 +37817,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5536443</v>
+                                    <v>5536444</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37785,7 +37833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5536443</v>
+                                    <v>5536444</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37999,11 +38047,11 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>47475</cardinality>
+            <cardinality>47521</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>47475</v>
+                    <v>47521</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -38455,7 +38503,7 @@
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1575684</v>
+                    <v>1575685</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38505,11 +38553,11 @@
         </relation>
         <relation>
             <name>jumpinfo</name>
-            <cardinality>347364</cardinality>
+            <cardinality>347365</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>347364</v>
+                    <v>347365</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -38531,7 +38579,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347364</v>
+                                    <v>347365</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38547,7 +38595,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347364</v>
+                                    <v>347365</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38686,11 +38734,11 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5704676</cardinality>
+            <cardinality>5704677</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5704676</v>
+                    <v>5704677</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -38698,7 +38746,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5701312</v>
+                    <v>5701313</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -38712,7 +38760,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5704676</v>
+                                    <v>5704677</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38728,7 +38776,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5704676</v>
+                                    <v>5704677</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38876,7 +38924,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5701178</v>
+                                    <v>5701179</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -38897,7 +38945,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5701312</v>
+                                    <v>5701313</v>
                                 </b>
                             </bs>
                         </hist>
@@ -38965,11 +39013,11 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>388572</cardinality>
+            <cardinality>388573</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>388572</v>
+                    <v>388573</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -38999,7 +39047,7 @@
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1948246</v>
+                    <v>1948247</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -39045,7 +39093,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3143969</v>
+                                    <v>3143970</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -39066,7 +39114,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3253356</v>
+                                    <v>3253357</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -39087,7 +39135,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1763647</v>
+                                    <v>1763648</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -39259,11 +39307,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>38279714</cardinality>
+            <cardinality>38279006</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>4869246</v>
+                    <v>4869162</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -39281,7 +39329,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>668754</v>
+                                    <v>668749</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -39291,7 +39339,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>4166464</v>
+                                    <v>4166386</v>
                                 </b>
                             </bs>
                         </hist>
@@ -39310,48 +39358,48 @@
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97237</a>
-                                    <b>97238</b>
+                                    <a>97236</a>
+                                    <b>97237</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97356</a>
-                                    <b>97357</b>
+                                    <a>97355</a>
+                                    <b>97356</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97409</a>
-                                    <b>97410</b>
+                                    <a>97408</a>
+                                    <b>97409</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97436</a>
-                                    <b>97437</b>
+                                    <a>97435</a>
+                                    <b>97436</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97458</a>
-                                    <b>97459</b>
+                                    <a>97457</a>
+                                    <b>97458</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>97491</a>
-                                    <b>97492</b>
+                                    <a>97490</a>
+                                    <b>97491</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>99497</a>
-                                    <b>99498</b>
+                                    <a>99496</a>
+                                    <b>99497</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>102876</a>
-                                    <b>102877</b>
+                                    <a>102875</a>
+                                    <b>102876</b>
                                     <v>42</v>
                                 </b>
                                 <b>
-                                    <a>104239</a>
-                                    <b>104240</b>
+                                    <a>104238</a>
+                                    <b>104239</b>
                                     <v>42</v>
                                 </b>
                             </bs>