diff --git a/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/exprs.ql b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/exprs.ql
new file mode 100644
index 000000000000..3af03b1d60b2
--- /dev/null
+++ b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/exprs.ql
@@ -0,0 +1,17 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class Location extends @location_default {
+  string toString() { none() }
+}
+
+predicate isExprWithNewBuiltin(Expr expr) {
+  exists(int kind | exprs(expr, kind, _) | 397 <= kind and kind <= 403)
+}
+
+from Expr expr, int kind, int kind_new, Location location
+where
+  exprs(expr, kind, location) and
+  if isExprWithNewBuiltin(expr) then kind_new = 1 else kind_new = kind
+select expr, kind_new, location
diff --git a/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/old.dbscheme b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/old.dbscheme
new file mode 100644
index 000000000000..293904928d85
--- /dev/null
+++ b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/old.dbscheme
@@ -0,0 +1,2602 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float            // C99-specific _Complex float
+| 28 = @complex_double           // C99-specific _Complex double
+| 29 = @complex_long_double      // C99-specific _Complex long double
+| 30 = @imaginary_float          // C99-specific _Imaginary float
+| 31 = @imaginary_double         // C99-specific _Imaginary double
+| 32 = @imaginary_long_double    // C99-specific _Imaginary long double
+| 33 = @wchar_t                  // Microsoft-specific
+| 34 = @decltype_nullptr         // C++11
+| 35 = @int128                   // __int128
+| 36 = @unsigned_int128          // unsigned __int128
+| 37 = @signed_int128            // signed __int128
+| 38 = @float128                 // __float128
+| 39 = @complex_float128         // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32              // _Float32
+| 46 = @float32x                 // _Float32x
+| 47 = @std_float64              // _Float64
+| 48 = @float64x                 // _Float64x
+| 49 = @std_float128             // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16                  // _Float16
+| 53 = @complex_float16          // _Complex _Float16
+| 54 = @fp16                     // __fp16
+| 55 = @std_bfloat16             // __bf16
+| 56 = @std_float16              // std::float16_t
+| 57 = @complex_std_float32      // _Complex _Float32
+| 58 = @complex_float32x         // _Complex _Float32x
+| 59 = @complex_std_float64      // _Complex _Float64
+| 60 = @complex_float64x         // _Complex _Float64x
+| 61 = @complex_std_float128     // _Complex _Float128
+| 62 = @mfp8                     // __mfp8
+| 63 = @scalable_vector_count    // __SVCount_t
+| 64 = @complex_fp16             // _Complex __fp16
+| 65 = @complex_std_bfloat16     // _Complex __bf16
+| 66 = @complex_std_float16      // _Complex std::float16_t
+| 67 = @bit_precise_int          // _BitInt(N)
+| 68 = @unsigned_bit_precise_int // unsigned _BitInt(N)
+| 69 = @signed_bit_precise_int   // signed _BitInt(N)
+;
+
+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
+);
+
+bit_precise_int_types(
+    unique int id: @builtintype ref,
+    int bit_width: int ref
+)
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(
+    unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+| 397 = @isvirtualbaseof
+| 398 = @isimplicitlifetime
+| 399 = @ltsynthesizesfromspaceship
+| 400 = @gtsynthesizesfromspaceship
+| 401 = @lesynthesizesfromspaceship
+| 402 = @gesynthesizesfromspaceship
+| 403 = @isstructural
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            | @isvirtualbaseof
+            | @isimplicitlifetime
+            | @ltsynthesizesfromspaceship
+            | @gtsynthesizesfromspaceship
+            | @lesynthesizesfromspaceship
+            | @gesynthesizesfromspaceship
+            | @isstructural
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/semmlecode.cpp.dbscheme b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..6aec212e408f
--- /dev/null
+++ b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/semmlecode.cpp.dbscheme
@@ -0,0 +1,2588 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float            // C99-specific _Complex float
+| 28 = @complex_double           // C99-specific _Complex double
+| 29 = @complex_long_double      // C99-specific _Complex long double
+| 30 = @imaginary_float          // C99-specific _Imaginary float
+| 31 = @imaginary_double         // C99-specific _Imaginary double
+| 32 = @imaginary_long_double    // C99-specific _Imaginary long double
+| 33 = @wchar_t                  // Microsoft-specific
+| 34 = @decltype_nullptr         // C++11
+| 35 = @int128                   // __int128
+| 36 = @unsigned_int128          // unsigned __int128
+| 37 = @signed_int128            // signed __int128
+| 38 = @float128                 // __float128
+| 39 = @complex_float128         // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32              // _Float32
+| 46 = @float32x                 // _Float32x
+| 47 = @std_float64              // _Float64
+| 48 = @float64x                 // _Float64x
+| 49 = @std_float128             // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16                  // _Float16
+| 53 = @complex_float16          // _Complex _Float16
+| 54 = @fp16                     // __fp16
+| 55 = @std_bfloat16             // __bf16
+| 56 = @std_float16              // std::float16_t
+| 57 = @complex_std_float32      // _Complex _Float32
+| 58 = @complex_float32x         // _Complex _Float32x
+| 59 = @complex_std_float64      // _Complex _Float64
+| 60 = @complex_float64x         // _Complex _Float64x
+| 61 = @complex_std_float128     // _Complex _Float128
+| 62 = @mfp8                     // __mfp8
+| 63 = @scalable_vector_count    // __SVCount_t
+| 64 = @complex_fp16             // _Complex __fp16
+| 65 = @complex_std_bfloat16     // _Complex __bf16
+| 66 = @complex_std_float16      // _Complex std::float16_t
+| 67 = @bit_precise_int          // _BitInt(N)
+| 68 = @unsigned_bit_precise_int // unsigned _BitInt(N)
+| 69 = @signed_bit_precise_int   // signed _BitInt(N)
+;
+
+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
+);
+
+bit_precise_int_types(
+    unique int id: @builtintype ref,
+    int bit_width: int ref
+)
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(
+    unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/upgrade.properties b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/upgrade.properties
new file mode 100644
index 000000000000..d697a16a42fd
--- /dev/null
+++ b/cpp/downgrades/293904928d857b61a44dc0ff34c89c9eccb8a90a/upgrade.properties
@@ -0,0 +1,3 @@
+description: Add new builtin operations
+compatibility: partial
+exprs.rel: run exprs.qlo
diff --git a/cpp/ql/lib/change-notes/2026-10-16-builtins.md b/cpp/ql/lib/change-notes/2026-10-16-builtins.md
new file mode 100644
index 000000000000..2434e465cd5a
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2026-10-16-builtins.md
@@ -0,0 +1,4 @@
+---
+category: feature
+---
+* Added support for the `__builtin_lt_synthesizes_from_spaceship`, `__builtin_gt_synthesizes_from_spaceship`, `__builtin_le_synthesizes_from_spaceship`, `__builtin_ge_synthesizes_from_spaceship`, `__builtin_is_implicit_lifetime`, `__builtin_is_structural`, and `__builtin_is_virtual_base_of` builtin operations.
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll b/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll
index 2246a887b9c1..be7636fdadee 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll
@@ -353,6 +353,21 @@ class BuiltInOperationIsBaseOf extends BuiltInOperation, @isbaseofexpr {
   override string getAPrimaryQlClass() { result = "BuiltInOperationIsBaseOf" }
 }
 
+/**
+ * A C++ `__builtin_is_virtual_base_of` built-in operation (used by some implementations of the
+ * `<type_traits>` header).
+ *
+ * Returns `true` if the first type is a virtual base class of the second type.
+ * ```
+ * bool v = __builtin_is_virtual_base_of(MyType, OtherType);
+ * ```
+ */
+class BuiltInOperationIsVirtualBaseOf extends BuiltInOperation, @isvirtualbaseof {
+  override string toString() { result = "__builtin_is_virtual_base_of" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationIsVirtualBaseOf" }
+}
+
 /**
  * A C++ `__is_class` built-in operation (used by some implementations of the
  * `<type_traits>` header).
@@ -1999,3 +2014,105 @@ class BuiltInOperationIsNothrowInvocable extends BuiltInOperation, @isnothrowinv
 
   override string getAPrimaryQlClass() { result = "BuiltInOperationIsNothrowInvocable" }
 }
+
+/**
+ * A C++ `__builtin_is_implicit_lifetime` built-in operation (used by some implementations
+ * of the `<type_traits>` header).
+ *
+ * Returns `true` if a type `_Tp` is an implicit lifetime type.
+ *
+ * ```
+ * template<typename _Tp>
+ * constexpr bool is_implicit_lifetime = __builtin_is_implicit_lifetime(_Tp);
+ * ```
+ */
+class BuiltInOperationIsImplicitLifetime extends BuiltInOperation, @isimplicitlifetime {
+  override string toString() { result = "__builtin_is_implicit_lifetime" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationIsImplicitLifetime" }
+}
+
+/**
+ * A C++ `__builtin_is_structural` built-in operation (used by some implementations
+ * of the `<type_traits>` header).
+ *
+ * Returns `true` if a type `_Tp` is structural type.
+ *
+ * ```
+ * template<typename _Tp>
+ * constexpr bool is_structural = __builtin_is_structural(_Tp);
+ * ```
+ */
+class BuiltInOperationIsStructural extends BuiltInOperation, @isstructural {
+  override string toString() { result = "__builtin_is_structural" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationIsStructural" }
+}
+
+/**
+ * A C++ `__builtin_lt_synthesizes_from_spaceship` built-in operation (used by some container
+ * implementations).
+ *
+ * Returns `true` if the `<` operator is synthesized from the spaceship operator `<=>`.
+ *
+ * ```
+ * bool v = __builtin_lt_synthesizes_from_spaceship(MyType, OtherType);
+ */
+class BuiltInOperationLtSynthesizesFromSpaceship extends BuiltInOperation,
+  @ltsynthesizesfromspaceship
+{
+  override string toString() { result = "__builtin_lt_synthesizes_from_spaceship" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationLtSynthesizesFromSpaceship" }
+}
+
+/**
+ * A C++ `__builtin_gt_synthesizes_from_spaceship` built-in operation (used by some container
+ * implementations).
+ *
+ * Returns `true` if the `>` operator is synthesized from the spaceship operator `<=>`.
+ *
+ *  ```
+ * bool v = __builtin_gt_synthesizes_from_spaceship(MyType, OtherType);
+ */
+class BuiltInOperationGtSynthesizesFromSpaceship extends BuiltInOperation,
+  @gtsynthesizesfromspaceship
+{
+  override string toString() { result = "__builtin_gt_synthesizes_from_spaceship" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationGtSynthesizesFromSpaceship" }
+}
+
+/**
+ * A C++ `__builtin_le_synthesizes_from_spaceship` built-in operation (used by some container
+ * implementations).
+ *
+ * Returns `true` if the `<=` operator is synthesized from the spaceship operator `<=>`.
+ *
+ * ```
+ * bool v = __builtin_le_synthesizes_from_spaceship(MyType, OtherType);
+ */
+class BuiltInOperationLeSynthesizesFromSpaceship extends BuiltInOperation,
+  @lesynthesizesfromspaceship
+{
+  override string toString() { result = "__builtin_le_synthesizes_from_spaceship" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationLeSynthesizesFromSpaceship" }
+}
+
+/**
+ * A C++ `__builtin_ge_synthesizes_from_spaceship` built-in operation (used by some container
+ * implementations).
+ *
+ * Returns `true` if the `>=` operator is synthesized from the spaceship operator `<=>`.
+ *
+ * ```
+ * bool v = __builtin_ge_synthesizes_from_spaceship(MyType, OtherType);
+ */
+class BuiltInOperationGeSynthesizesFromSpaceship extends BuiltInOperation,
+  @gesynthesizesfromspaceship
+{
+  override string toString() { result = "__builtin_ge_synthesizes_from_spaceship" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationGeSynthesizesFromSpaceship" }
+}
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 6aec212e408f..293904928d85 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -2004,6 +2004,13 @@ case @expr.kind of
 | 394 = @isinvocable
 | 395 = @isnothrowinvocable
 | 396 = @isbitwisecloneable
+| 397 = @isvirtualbaseof
+| 398 = @isimplicitlifetime
+| 399 = @ltsynthesizesfromspaceship
+| 400 = @gtsynthesizesfromspaceship
+| 401 = @lesynthesizesfromspaceship
+| 402 = @gesynthesizesfromspaceship
+| 403 = @isstructural
 ;
 
 @var_args_expr = @vastartexpr
@@ -2123,6 +2130,13 @@ case @expr.kind of
             | @isinvocable
             | @isnothrowinvocable
             | @isbitwisecloneable
+            | @isvirtualbaseof
+            | @isimplicitlifetime
+            | @ltsynthesizesfromspaceship
+            | @gtsynthesizesfromspaceship
+            | @lesynthesizesfromspaceship
+            | @gesynthesizesfromspaceship
+            | @isstructural
             ;
 
 compound_requirement_is_noexcept(
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 8f5c157b1ae7..90a3250189fb 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -2,7 +2,7 @@
     <typesizes>
         <e>
             <k>@compilation</k>
-            <v>12799</v>
+            <v>12794</v>
         </e>
         <e>
             <k>@externalDataElement</k>
@@ -10,11 +10,11 @@
         </e>
         <e>
             <k>@file</k>
-            <v>66019</v>
+            <v>65994</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>12543</v>
+            <v>12538</v>
         </e>
         <e>
             <k>@diagnostic</k>
@@ -22,7 +22,7 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>46369281</v>
+            <v>46368911</v>
         </e>
         <e>
             <k>@trap</k>
@@ -42,15 +42,15 @@
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>40292589</v>
+            <v>40292268</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
-            <v>300524</v>
+            <v>300521</v>
         </e>
         <e>
             <k>@normal_function</k>
-            <v>2699603</v>
+            <v>2699581</v>
         </e>
         <e>
             <k>@unknown_function</k>
@@ -58,11 +58,11 @@
         </e>
         <e>
             <k>@constructor</k>
-            <v>692625</v>
+            <v>692574</v>
         </e>
         <e>
             <k>@destructor</k>
-            <v>84842</v>
+            <v>84841</v>
         </e>
         <e>
             <k>@conversion_function</k>
@@ -70,7 +70,7 @@
         </e>
         <e>
             <k>@operator</k>
-            <v>647305</v>
+            <v>647300</v>
         </e>
         <e>
             <k>@user_defined_literal</k>
@@ -82,23 +82,23 @@
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4149410</v>
+            <v>4149377</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>9411101</v>
+            <v>9411026</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>1639750</v>
+            <v>1639737</v>
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>406675</v>
+            <v>406672</v>
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>270974</v>
+            <v>271344</v>
         </e>
         <e>
             <k>@using_directive</k>
@@ -110,27 +110,27 @@
         </e>
         <e>
             <k>@static_assert</k>
-            <v>172120</v>
+            <v>172118</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>6932137</v>
+            <v>6932082</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1502215</v>
+            <v>1502203</v>
         </e>
         <e>
             <k>@globalvariable</k>
-            <v>634536</v>
+            <v>634531</v>
         </e>
         <e>
             <k>@localvariable</k>
-            <v>733038</v>
+            <v>733187</v>
         </e>
         <e>
             <k>@enumconstant</k>
-            <v>347913</v>
+            <v>347910</v>
         </e>
         <e>
             <k>@errortype</k>
@@ -366,11 +366,11 @@
         </e>
         <e>
             <k>@bit_precise_int</k>
-            <v>3</v>
+            <v>4</v>
         </e>
         <e>
             <k>@unsigned_bit_precise_int</k>
-            <v>4</v>
+            <v>6</v>
         </e>
         <e>
             <k>@signed_bit_precise_int</k>
@@ -378,23 +378,23 @@
         </e>
         <e>
             <k>@pointer</k>
-            <v>449258</v>
+            <v>449255</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>686964</v>
+            <v>686958</v>
         </e>
         <e>
             <k>@array</k>
-            <v>89630</v>
+            <v>89629</v>
         </e>
         <e>
             <k>@routineptr</k>
-            <v>678207</v>
+            <v>678157</v>
         </e>
         <e>
             <k>@reference</k>
-            <v>959048</v>
+            <v>959040</v>
         </e>
         <e>
             <k>@gnu_vector</k>
@@ -406,7 +406,7 @@
         </e>
         <e>
             <k>@rvalue_reference</k>
-            <v>286941</v>
+            <v>286938</v>
         </e>
         <e>
             <k>@block</k>
@@ -416,10 +416,6 @@
             <k>@scalable_vector</k>
             <v>1</v>
         </e>
-        <e>
-            <k>@decltype</k>
-            <v>101803</v>
-        </e>
         <e>
             <k>@typeof</k>
             <v>811</v>
@@ -498,15 +494,19 @@
         </e>
         <e>
             <k>@remove_reference</k>
-            <v>5694</v>
+            <v>5695</v>
+        </e>
+        <e>
+            <k>@decltype</k>
+            <v>101802</v>
         </e>
         <e>
             <k>@struct</k>
-            <v>1056586</v>
+            <v>1056347</v>
         </e>
         <e>
             <k>@union</k>
-            <v>20750</v>
+            <v>20749</v>
         </e>
         <e>
             <k>@enum</k>
@@ -514,11 +514,11 @@
         </e>
         <e>
             <k>@template_parameter</k>
-            <v>879786</v>
+            <v>879462</v>
         </e>
         <e>
             <k>@alias</k>
-            <v>1791267</v>
+            <v>1791463</v>
         </e>
         <e>
             <k>@unknown_usertype</k>
@@ -526,15 +526,15 @@
         </e>
         <e>
             <k>@class</k>
-            <v>320951</v>
+            <v>320949</v>
         </e>
         <e>
             <k>@template_template_parameter</k>
-            <v>6191</v>
+            <v>6189</v>
         </e>
         <e>
             <k>@proxy_class</k>
-            <v>51198</v>
+            <v>51179</v>
         </e>
         <e>
             <k>@scoped_enum</k>
@@ -542,7 +542,7 @@
         </e>
         <e>
             <k>@template_struct</k>
-            <v>214653</v>
+            <v>214585</v>
         </e>
         <e>
             <k>@template_class</k>
@@ -554,11 +554,11 @@
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6345485</v>
+            <v>6345435</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>5937930</v>
+            <v>5937883</v>
         </e>
         <e>
             <k>@concept_template</k>
@@ -566,11 +566,11 @@
         </e>
         <e>
             <k>@routinetype</k>
-            <v>599125</v>
+            <v>599081</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>9837</v>
+            <v>9834</v>
         </e>
         <e>
             <k>@specifier</k>
@@ -582,11 +582,11 @@
         </e>
         <e>
             <k>@stdattribute</k>
-            <v>347840</v>
+            <v>347838</v>
         </e>
         <e>
             <k>@declspec</k>
-            <v>330275</v>
+            <v>330272</v>
         </e>
         <e>
             <k>@msattribute</k>
@@ -598,11 +598,11 @@
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>16545</v>
+            <v>16544</v>
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>72691</v>
+            <v>72665</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
@@ -622,19 +622,19 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>494887</v>
+            <v>494850</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>765587</v>
+            <v>765911</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>11058465</v>
+            <v>11058376</v>
         </e>
         <e>
             <k>@namespace</k>
-            <v>8757</v>
+            <v>8754</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
@@ -642,15 +642,15 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>3044887</v>
+            <v>3044942</v>
         </e>
         <e>
             <k>@value</k>
-            <v>13539325</v>
+            <v>13539217</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>2292690</v>
+            <v>2292672</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -658,19 +658,19 @@
         </e>
         <e>
             <k>@indirect</k>
-            <v>401768</v>
+            <v>401764</v>
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1953190</v>
+            <v>1953174</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>4913791</v>
+            <v>4913752</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
-            <v>586365</v>
+            <v>586361</v>
         </e>
         <e>
             <k>@unaryplusexpr</k>
@@ -678,23 +678,23 @@
         </e>
         <e>
             <k>@complementexpr</k>
-            <v>38173</v>
+            <v>38172</v>
         </e>
         <e>
             <k>@notexpr</k>
-            <v>355664</v>
+            <v>355661</v>
         </e>
         <e>
             <k>@postincrexpr</k>
-            <v>84542</v>
+            <v>84541</v>
         </e>
         <e>
             <k>@postdecrexpr</k>
-            <v>57376</v>
+            <v>57375</v>
         </e>
         <e>
             <k>@preincrexpr</k>
-            <v>96686</v>
+            <v>96685</v>
         </e>
         <e>
             <k>@predecrexpr</k>
@@ -702,55 +702,55 @@
         </e>
         <e>
             <k>@conditionalexpr</k>
-            <v>897622</v>
+            <v>897615</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>580708</v>
+            <v>580703</v>
         </e>
         <e>
             <k>@subexpr</k>
-            <v>466665</v>
+            <v>466661</v>
         </e>
         <e>
             <k>@mulexpr</k>
-            <v>445292</v>
+            <v>445289</v>
         </e>
         <e>
             <k>@divexpr</k>
-            <v>52369</v>
+            <v>52368</v>
         </e>
         <e>
             <k>@remexpr</k>
-            <v>15870</v>
+            <v>15869</v>
         </e>
         <e>
             <k>@paddexpr</k>
-            <v>118586</v>
+            <v>118585</v>
         </e>
         <e>
             <k>@psubexpr</k>
-            <v>67993</v>
+            <v>67992</v>
         </e>
         <e>
             <k>@pdiffexpr</k>
-            <v>43833</v>
+            <v>43832</v>
         </e>
         <e>
             <k>@lshiftexpr</k>
-            <v>552173</v>
+            <v>552169</v>
         </e>
         <e>
             <k>@rshiftexpr</k>
-            <v>201367</v>
+            <v>201365</v>
         </e>
         <e>
             <k>@andexpr</k>
-            <v>483452</v>
+            <v>483448</v>
         </e>
         <e>
             <k>@orexpr</k>
-            <v>193999</v>
+            <v>193997</v>
         </e>
         <e>
             <k>@xorexpr</k>
@@ -758,19 +758,19 @@
         </e>
         <e>
             <k>@eqexpr</k>
-            <v>643188</v>
+            <v>643183</v>
         </e>
         <e>
             <k>@neexpr</k>
-            <v>411752</v>
+            <v>411749</v>
         </e>
         <e>
             <k>@gtexpr</k>
-            <v>111117</v>
+            <v>111116</v>
         </e>
         <e>
             <k>@ltexpr</k>
-            <v>139389</v>
+            <v>139388</v>
         </e>
         <e>
             <k>@geexpr</k>
@@ -778,11 +778,11 @@
         </e>
         <e>
             <k>@leexpr</k>
-            <v>291831</v>
+            <v>291828</v>
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>1280779</v>
+            <v>1280769</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -794,7 +794,7 @@
         </e>
         <e>
             <k>@assignmulexpr</k>
-            <v>11324</v>
+            <v>11319</v>
         </e>
         <e>
             <k>@assigndivexpr</k>
@@ -834,23 +834,23 @@
         </e>
         <e>
             <k>@andlogicalexpr</k>
-            <v>346490</v>
+            <v>346487</v>
         </e>
         <e>
             <k>@orlogicalexpr</k>
-            <v>1103221</v>
+            <v>1103212</v>
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>165264</v>
+            <v>165262</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
-            <v>435018</v>
+            <v>435015</v>
         </e>
         <e>
             <k>@callexpr</k>
-            <v>263482</v>
+            <v>263463</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -870,39 +870,39 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>8252279</v>
+            <v>8252213</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
-            <v>401589</v>
+            <v>401586</v>
         </e>
         <e>
             <k>@runtime_alignof</k>
-            <v>50650</v>
+            <v>50646</v>
         </e>
         <e>
             <k>@expr_stmt</k>
-            <v>147584</v>
+            <v>147583</v>
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>5708751</v>
+            <v>5708855</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1404979</v>
+            <v>1404968</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
-            <v>148494</v>
+            <v>148493</v>
         </e>
         <e>
             <k>@typescompexpr</k>
-            <v>701742</v>
+            <v>701736</v>
         </e>
         <e>
             <k>@literal</k>
-            <v>8035745</v>
+            <v>8036394</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -910,27 +910,27 @@
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>6023777</v>
+            <v>6023782</v>
         </e>
         <e>
             <k>@temp_init</k>
-            <v>984852</v>
+            <v>985294</v>
         </e>
         <e>
             <k>@errorexpr</k>
-            <v>45078</v>
+            <v>45075</v>
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1891026</v>
+            <v>1890439</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2091992</v>
+            <v>2091838</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
-            <v>7766</v>
+            <v>7765</v>
         </e>
         <e>
             <k>@assume</k>
@@ -986,31 +986,31 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1554385</v>
+            <v>1554373</v>
         </e>
         <e>
             <k>@new_expr</k>
-            <v>45787</v>
+            <v>45784</v>
         </e>
         <e>
             <k>@delete_expr</k>
-            <v>11379</v>
+            <v>11378</v>
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>23913</v>
+            <v>23918</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>406885</v>
+            <v>406893</v>
         </e>
         <e>
             <k>@braced_init_list</k>
-            <v>2114</v>
+            <v>2115</v>
         </e>
         <e>
             <k>@type_id</k>
-            <v>47476</v>
+            <v>47472</v>
         </e>
         <e>
             <k>@sizeof_pack</k>
@@ -1118,7 +1118,7 @@
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>111802</v>
+            <v>111793</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
@@ -1126,7 +1126,7 @@
         </e>
         <e>
             <k>@ctorfieldinit</k>
-            <v>204063</v>
+            <v>204061</v>
         </e>
         <e>
             <k>@ctordelegatinginit</k>
@@ -1134,7 +1134,7 @@
         </e>
         <e>
             <k>@dtordirectdestruct</k>
-            <v>39102</v>
+            <v>39099</v>
         </e>
         <e>
             <k>@dtorvirtualdestruct</k>
@@ -1142,11 +1142,11 @@
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>39473</v>
+            <v>39470</v>
         </e>
         <e>
             <k>@static_cast</k>
-            <v>348331</v>
+            <v>348329</v>
         </e>
         <e>
             <k>@reinterpret_cast</k>
@@ -1154,7 +1154,7 @@
         </e>
         <e>
             <k>@const_cast</k>
-            <v>24244</v>
+            <v>24242</v>
         </e>
         <e>
             <k>@dynamic_cast</k>
@@ -1166,11 +1166,11 @@
         </e>
         <e>
             <k>@param_ref</k>
-            <v>165240</v>
+            <v>165342</v>
         </e>
         <e>
             <k>@noopexpr</k>
-            <v>113</v>
+            <v>89</v>
         </e>
         <e>
             <k>@istriviallyconstructibleexpr</k>
@@ -1266,11 +1266,11 @@
         </e>
         <e>
             <k>@isfinalexpr</k>
-            <v>9319</v>
+            <v>9318</v>
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>30482</v>
+            <v>30501</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1326,7 +1326,7 @@
         </e>
         <e>
             <k>@builtinshuffle</k>
-            <v>620</v>
+            <v>619</v>
         </e>
         <e>
             <k>@blockassignexpr</k>
@@ -1442,7 +1442,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>842823</v>
+            <v>842839</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1554,7 +1554,7 @@
         </e>
         <e>
             <k>@concept_id</k>
-            <v>90176</v>
+            <v>90178</v>
         </e>
         <e>
             <k>@isinvocable</k>
@@ -1568,17 +1568,45 @@
             <k>@isbitwisecloneable</k>
             <v>2</v>
         </e>
+        <e>
+            <k>@isvirtualbaseof</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@isimplicitlifetime</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@ltsynthesizesfromspaceship</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@gtsynthesizesfromspaceship</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@lesynthesizesfromspaceship</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@gesynthesizesfromspaceship</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@isstructural</k>
+            <v>2</v>
+        </e>
         <e>
             <k>@lambdacapture</k>
             <v>31901</v>
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>2031035</v>
+            <v>2031019</v>
         </e>
         <e>
             <k>@stmt_if</k>
-            <v>989932</v>
+            <v>989924</v>
         </e>
         <e>
             <k>@stmt_while</k>
@@ -1586,35 +1614,35 @@
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>159862</v>
+            <v>159803</v>
         </e>
         <e>
             <k>@stmt_label</k>
-            <v>79011</v>
+            <v>78982</v>
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1257082</v>
+            <v>1257325</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1707526</v>
+            <v>1707512</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
-            <v>232395</v>
+            <v>232393</v>
         </e>
         <e>
             <k>@stmt_for</k>
-            <v>84365</v>
+            <v>84364</v>
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>831947</v>
+            <v>831962</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>409797</v>
+            <v>409804</v>
         </e>
         <e>
             <k>@stmt_asm</k>
@@ -1622,11 +1650,11 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>772377</v>
+            <v>772371</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>427267</v>
+            <v>427275</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1634,11 +1662,11 @@
         </e>
         <e>
             <k>@stmt_break</k>
-            <v>137610</v>
+            <v>137609</v>
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>26563</v>
+            <v>26569</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
@@ -1658,15 +1686,15 @@
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>6221</v>
+            <v>6225</v>
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>43492</v>
+            <v>43502</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
-            <v>103259</v>
+            <v>103258</v>
         </e>
         <e>
             <k>@stmt_co_return</k>
@@ -1686,43 +1714,43 @@
         </e>
         <e>
             <k>@ppd_if</k>
-            <v>581617</v>
+            <v>581612</v>
         </e>
         <e>
             <k>@ppd_ifdef</k>
-            <v>214302</v>
+            <v>214300</v>
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>160319</v>
+            <v>160318</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>22188</v>
+            <v>22180</v>
         </e>
         <e>
             <k>@ppd_else</k>
-            <v>231198</v>
+            <v>231196</v>
         </e>
         <e>
             <k>@ppd_endif</k>
-            <v>874943</v>
+            <v>874936</v>
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>322504</v>
+            <v>322385</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2706601</v>
+            <v>2706580</v>
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>98839</v>
+            <v>98838</v>
         </e>
         <e>
             <k>@ppd_pragma</k>
-            <v>399777</v>
+            <v>399774</v>
         </e>
         <e>
             <k>@ppd_include_next</k>
@@ -1730,7 +1758,7 @@
         </e>
         <e>
             <k>@ppd_line</k>
-            <v>18996</v>
+            <v>19000</v>
         </e>
         <e>
             <k>@ppd_error</k>
@@ -1792,11 +1820,11 @@
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>12799</cardinality>
+            <cardinality>12794</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12799</v>
+                    <v>12794</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1814,7 +1842,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12799</v>
+                                    <v>12794</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1840,19 +1868,19 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1024731</cardinality>
+            <cardinality>1024354</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12799</v>
+                    <v>12794</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>1486</v>
+                    <v>1485</v>
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29630</v>
+                    <v>29619</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1871,12 +1899,12 @@
                                 <b>
                                     <a>42</a>
                                     <b>43</b>
-                                    <v>1112</v>
+                                    <v>1111</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>44</b>
-                                    <v>727</v>
+                                    <v>726</v>
                                 </b>
                                 <b>
                                     <a>44</a>
@@ -1911,7 +1939,7 @@
                                 <b>
                                     <a>98</a>
                                     <b>99</b>
-                                    <v>1358</v>
+                                    <v>1357</v>
                                 </b>
                                 <b>
                                     <a>100</a>
@@ -1926,7 +1954,7 @@
                                 <b>
                                     <a>104</a>
                                     <b>119</b>
-                                    <v>1080</v>
+                                    <v>1079</v>
                                 </b>
                                 <b>
                                     <a>120</a>
@@ -1957,7 +1985,7 @@
                                 <b>
                                     <a>38</a>
                                     <b>39</b>
-                                    <v>1518</v>
+                                    <v>1517</v>
                                 </b>
                                 <b>
                                     <a>39</a>
@@ -1967,7 +1995,7 @@
                                 <b>
                                     <a>40</a>
                                     <b>42</b>
-                                    <v>1101</v>
+                                    <v>1100</v>
                                 </b>
                                 <b>
                                     <a>42</a>
@@ -1992,7 +2020,7 @@
                                 <b>
                                     <a>67</a>
                                     <b>68</b>
-                                    <v>1422</v>
+                                    <v>1421</v>
                                 </b>
                                 <b>
                                     <a>68</a>
@@ -2002,7 +2030,7 @@
                                 <b>
                                     <a>70</a>
                                     <b>71</b>
-                                    <v>1422</v>
+                                    <v>1421</v>
                                 </b>
                                 <b>
                                     <a>73</a>
@@ -2012,7 +2040,7 @@
                                 <b>
                                     <a>79</a>
                                     <b>89</b>
-                                    <v>1144</v>
+                                    <v>1143</v>
                                 </b>
                                 <b>
                                     <a>89</a>
@@ -2180,17 +2208,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13569</v>
+                                    <v>13564</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12842</v>
+                                    <v>12837</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>103</b>
-                                    <v>2224</v>
+                                    <v>2223</v>
                                 </b>
                                 <b>
                                     <a>104</a>
@@ -2211,17 +2239,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19621</v>
+                                    <v>19614</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8832</v>
+                                    <v>8829</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>62</b>
-                                    <v>1176</v>
+                                    <v>1175</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2231,19 +2259,19 @@
         </relation>
         <relation>
             <name>compilation_expanded_args</name>
-            <cardinality>1024731</cardinality>
+            <cardinality>1024354</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12799</v>
+                    <v>12794</v>
                 </e>
                 <e>
                     <k>num</k>
-                    <v>1486</v>
+                    <v>1485</v>
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29630</v>
+                    <v>29619</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2262,12 +2290,12 @@
                                 <b>
                                     <a>42</a>
                                     <b>43</b>
-                                    <v>1112</v>
+                                    <v>1111</v>
                                 </b>
                                 <b>
                                     <a>43</a>
                                     <b>44</b>
-                                    <v>727</v>
+                                    <v>726</v>
                                 </b>
                                 <b>
                                     <a>44</a>
@@ -2302,7 +2330,7 @@
                                 <b>
                                     <a>98</a>
                                     <b>99</b>
-                                    <v>1358</v>
+                                    <v>1357</v>
                                 </b>
                                 <b>
                                     <a>100</a>
@@ -2317,7 +2345,7 @@
                                 <b>
                                     <a>104</a>
                                     <b>119</b>
-                                    <v>1080</v>
+                                    <v>1079</v>
                                 </b>
                                 <b>
                                     <a>120</a>
@@ -2348,7 +2376,7 @@
                                 <b>
                                     <a>38</a>
                                     <b>39</b>
-                                    <v>1518</v>
+                                    <v>1517</v>
                                 </b>
                                 <b>
                                     <a>39</a>
@@ -2358,7 +2386,7 @@
                                 <b>
                                     <a>40</a>
                                     <b>42</b>
-                                    <v>1101</v>
+                                    <v>1100</v>
                                 </b>
                                 <b>
                                     <a>42</a>
@@ -2383,7 +2411,7 @@
                                 <b>
                                     <a>67</a>
                                     <b>68</b>
-                                    <v>1422</v>
+                                    <v>1421</v>
                                 </b>
                                 <b>
                                     <a>68</a>
@@ -2393,7 +2421,7 @@
                                 <b>
                                     <a>70</a>
                                     <b>71</b>
-                                    <v>1422</v>
+                                    <v>1421</v>
                                 </b>
                                 <b>
                                     <a>73</a>
@@ -2403,7 +2431,7 @@
                                 <b>
                                     <a>79</a>
                                     <b>89</b>
-                                    <v>1144</v>
+                                    <v>1143</v>
                                 </b>
                                 <b>
                                     <a>89</a>
@@ -2571,17 +2599,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13569</v>
+                                    <v>13564</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12842</v>
+                                    <v>12837</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>103</b>
-                                    <v>2224</v>
+                                    <v>2223</v>
                                 </b>
                                 <b>
                                     <a>104</a>
@@ -2602,17 +2630,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19621</v>
+                                    <v>19614</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8832</v>
+                                    <v>8829</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>62</b>
-                                    <v>1176</v>
+                                    <v>1175</v>
                                 </b>
                             </bs>
                         </hist>
@@ -2916,7 +2944,7 @@
         </relation>
         <relation>
             <name>compilation_time</name>
-            <cardinality>62930</cardinality>
+            <cardinality>62929</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -2932,7 +2960,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>22646</v>
+                    <v>19434</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3013,27 +3041,22 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>326</v>
+                                    <v>381</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1034</v>
+                                    <v>979</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>7</b>
-                                    <v>163</v>
-                                </b>
-                                <b>
-                                    <a>8</a>
-                                    <b>10</b>
-                                    <v>163</v>
+                                    <b>9</b>
+                                    <v>217</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
+                                    <a>9</a>
                                     <b>11</b>
-                                    <v>108</v>
+                                    <v>217</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -3041,23 +3064,23 @@
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
+                                    <a>13</a>
                                     <b>18</b>
-                                    <v>163</v>
+                                    <v>217</v>
                                 </b>
                                 <b>
                                     <a>18</a>
-                                    <b>20</b>
-                                    <v>217</v>
+                                    <b>21</b>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>21</a>
-                                    <b>40</b>
+                                    <b>45</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>60</a>
-                                    <b>152</b>
+                                    <a>52</a>
+                                    <b>137</b>
                                     <v>108</v>
                                 </b>
                             </bs>
@@ -3126,42 +3149,47 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>925</v>
+                                    <v>1034</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1469</v>
+                                    <v>1415</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>108</v>
+                                    <v>272</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>653</v>
+                                    <v>272</v>
                                 </b>
                                 <b>
                                     <a>7</a>
+                                    <b>8</b>
+                                    <v>435</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
                                     <b>9</b>
-                                    <v>381</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>11</b>
+                                    <b>12</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>31</b>
+                                    <a>13</a>
+                                    <b>43</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>42</a>
-                                    <b>98</b>
-                                    <v>217</v>
+                                    <a>44</a>
+                                    <b>95</b>
+                                    <v>163</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3206,24 +3234,19 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
-                                <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>54</v>
-                                </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>54</v>
+                                    <v>108</v>
                                 </b>
                                 <b>
-                                    <a>226</a>
-                                    <b>227</b>
+                                    <a>198</a>
+                                    <b>199</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>230</a>
-                                    <b>231</b>
+                                    <a>201</a>
+                                    <b>202</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -3240,17 +3263,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17583</v>
+                                    <v>13446</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3701</v>
+                                    <v>3919</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>46</b>
-                                    <v>1360</v>
+                                    <b>5</b>
+                                    <v>1578</v>
+                                </b>
+                                <b>
+                                    <a>5</a>
+                                    <b>45</b>
+                                    <v>489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3266,22 +3294,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16494</v>
+                                    <v>12738</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4191</v>
+                                    <v>3701</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>8</b>
-                                    <v>1742</v>
+                                    <b>4</b>
+                                    <v>1687</v>
                                 </b>
                                 <b>
-                                    <a>12</a>
-                                    <b>71</b>
-                                    <v>217</v>
+                                    <a>4</a>
+                                    <b>65</b>
+                                    <v>1306</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3297,12 +3325,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19978</v>
+                                    <v>16603</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2667</v>
+                                    <v>2830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3578,19 +3606,19 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>12799</cardinality>
+            <cardinality>12794</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12799</v>
+                    <v>12794</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>8843</v>
+                    <v>9791</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>149</v>
+                    <v>256</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3604,7 +3632,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12799</v>
+                                    <v>12794</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3620,7 +3648,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12799</v>
+                                    <v>12794</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3636,17 +3664,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7078</v>
+                                    <v>8316</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1186</v>
+                                    <v>1004</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>34</b>
-                                    <v>577</v>
+                                    <b>20</b>
+                                    <v>470</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3662,12 +3690,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8009</v>
+                                    <v>9182</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>834</v>
+                                    <v>609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3683,17 +3711,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>32</v>
+                                    <v>74</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>10</v>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -3701,39 +3724,39 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
+                                    <a>6</a>
+                                    <b>7</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>25</b>
-                                    <v>10</v>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
-                                    <b>31</b>
-                                    <v>10</v>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>37</a>
-                                    <b>38</b>
-                                    <v>10</v>
+                                    <a>16</a>
+                                    <b>30</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>235</a>
-                                    <b>236</b>
-                                    <v>10</v>
+                                    <a>41</a>
+                                    <b>98</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>411</a>
-                                    <b>412</b>
-                                    <v>10</v>
+                                    <a>157</a>
+                                    <b>229</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>418</a>
-                                    <b>419</b>
-                                    <v>10</v>
+                                    <a>268</a>
+                                    <b>290</b>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3749,17 +3772,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>32</v>
+                                    <v>74</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>10</v>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -3767,39 +3785,39 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
+                                    <a>6</a>
+                                    <b>7</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>24</a>
-                                    <b>25</b>
-                                    <v>10</v>
+                                    <a>8</a>
+                                    <b>12</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>30</a>
-                                    <b>31</b>
-                                    <v>10</v>
+                                    <a>13</a>
+                                    <b>14</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>37</a>
-                                    <b>38</b>
-                                    <v>10</v>
+                                    <a>16</a>
+                                    <b>30</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>200</a>
-                                    <b>201</b>
-                                    <v>10</v>
+                                    <a>41</a>
+                                    <b>96</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>216</a>
-                                    <b>217</b>
-                                    <v>10</v>
+                                    <a>134</a>
+                                    <b>152</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>356</a>
-                                    <b>357</b>
-                                    <v>10</v>
+                                    <a>204</a>
+                                    <b>232</b>
+                                    <v>21</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4036,11 +4054,11 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>46369281</cardinality>
+            <cardinality>46368911</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>46369281</v>
+                    <v>46368911</v>
                 </e>
                 <e>
                     <k>file</k>
@@ -4048,7 +4066,7 @@
                 </e>
                 <e>
                     <k>beginLine</k>
-                    <v>7382992</v>
+                    <v>7382933</v>
                 </e>
                 <e>
                     <k>beginColumn</k>
@@ -4056,7 +4074,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>7383974</v>
+                    <v>7383915</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -4074,7 +4092,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46369281</v>
+                                    <v>46368911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4090,7 +4108,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46369281</v>
+                                    <v>46368911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4106,7 +4124,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46369281</v>
+                                    <v>46368911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4122,7 +4140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46369281</v>
+                                    <v>46368911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4138,7 +4156,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46369281</v>
+                                    <v>46368911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4539,27 +4557,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4879594</v>
+                                    <v>4879555</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>768245</v>
+                                    <v>768239</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>535451</v>
+                                    <v>535447</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>558166</v>
+                                    <v>558161</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>97</b>
-                                    <v>555342</v>
+                                    <v>555337</v>
                                 </b>
                                 <b>
                                     <a>97</a>
@@ -4580,27 +4598,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4940984</v>
+                                    <v>4940945</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1200560</v>
+                                    <v>1200550</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>629747</v>
+                                    <v>629742</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>56</b>
-                                    <v>554973</v>
+                                    <v>554969</v>
                                 </b>
                                 <b>
                                     <a>56</a>
                                     <b>329</b>
-                                    <v>56725</v>
+                                    <v>56724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4616,27 +4634,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5554157</v>
+                                    <v>5554112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>476638</v>
+                                    <v>476635</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>569093</v>
+                                    <v>569089</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>557061</v>
+                                    <v>557056</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>94</b>
-                                    <v>226041</v>
+                                    <v>226039</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4652,12 +4670,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6923297</v>
+                                    <v>6923241</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>85</b>
-                                    <v>459695</v>
+                                    <v>459691</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4673,27 +4691,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4947124</v>
+                                    <v>4947084</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>731165</v>
+                                    <v>731159</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>528207</v>
+                                    <v>528203</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>576214</v>
+                                    <v>576210</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>71</b>
-                                    <v>554605</v>
+                                    <v>554600</v>
                                 </b>
                                 <b>
                                     <a>71</a>
@@ -5094,32 +5112,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4877384</v>
+                                    <v>4877345</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>771560</v>
+                                    <v>771554</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>534714</v>
+                                    <v>534710</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>557061</v>
+                                    <v>557056</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>94</b>
-                                    <v>553868</v>
+                                    <v>553864</v>
                                 </b>
                                 <b>
                                     <a>94</a>
                                     <b>622</b>
-                                    <v>89385</v>
+                                    <v>89384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5135,27 +5153,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4938038</v>
+                                    <v>4937998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1204121</v>
+                                    <v>1204111</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>622258</v>
+                                    <v>622253</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>51</b>
-                                    <v>554850</v>
+                                    <v>554846</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>329</b>
-                                    <v>64706</v>
+                                    <v>64705</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5171,12 +5189,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6940118</v>
+                                    <v>6940062</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>443856</v>
+                                    <v>443852</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5192,27 +5210,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5552806</v>
+                                    <v>5552762</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>475165</v>
+                                    <v>475161</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>573268</v>
+                                    <v>573263</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>559762</v>
+                                    <v>559757</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>89</b>
-                                    <v>222971</v>
+                                    <v>222969</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5228,27 +5246,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4945650</v>
+                                    <v>4945611</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>736322</v>
+                                    <v>736316</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>526611</v>
+                                    <v>526606</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>578056</v>
+                                    <v>578052</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>72</b>
-                                    <v>554359</v>
+                                    <v>554355</v>
                                 </b>
                                 <b>
                                     <a>72</a>
@@ -5563,15 +5581,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>66019</cardinality>
+            <cardinality>65994</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>66019</v>
+                    <v>65994</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>66019</v>
+                    <v>65994</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5585,7 +5603,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>66019</v>
+                                    <v>65994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5601,7 +5619,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>66019</v>
+                                    <v>65994</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5611,15 +5629,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>12543</cardinality>
+            <cardinality>12538</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12543</v>
+                    <v>12538</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>12543</v>
+                    <v>12538</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5633,7 +5651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12543</v>
+                                    <v>12538</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5649,7 +5667,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12543</v>
+                                    <v>12538</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5659,15 +5677,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>78540</cardinality>
+            <cardinality>78512</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>12543</v>
+                    <v>12538</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>78540</v>
+                    <v>78512</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5681,7 +5699,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6105</v>
+                                    <v>6103</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5732,7 +5750,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>78540</v>
+                                    <v>78512</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5742,15 +5760,15 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>794398</cardinality>
+            <cardinality>794391</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>793293</v>
+                    <v>793286</v>
                 </e>
                 <e>
                     <k>num_lines</k>
-                    <v>38799</v>
+                    <v>38798</v>
                 </e>
                 <e>
                     <k>num_code</k>
@@ -5772,7 +5790,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>792188</v>
+                                    <v>792181</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5793,7 +5811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>792188</v>
+                                    <v>792181</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5814,7 +5832,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>793047</v>
+                                    <v>793041</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5907,7 +5925,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26398</v>
+                                    <v>26397</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5984,7 +6002,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21855</v>
+                                    <v>21854</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7508,11 +7526,11 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>4252500</cardinality>
+            <cardinality>4250935</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5838</v>
+                    <v>5836</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -7520,11 +7538,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>59443</v>
+                    <v>59421</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>40002</v>
+                    <v>39988</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7543,7 +7561,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5635</v>
+                                    <v>5633</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7569,7 +7587,7 @@
                                 <b>
                                     <a>212</a>
                                     <b>291</b>
-                                    <v>449</v>
+                                    <v>448</v>
                                 </b>
                                 <b>
                                     <a>291</a>
@@ -7594,7 +7612,7 @@
                                 <b>
                                     <a>550</a>
                                     <b>551</b>
-                                    <v>1347</v>
+                                    <v>1346</v>
                                 </b>
                                 <b>
                                     <a>553</a>
@@ -7609,7 +7627,7 @@
                                 <b>
                                     <a>753</a>
                                     <b>1231</b>
-                                    <v>449</v>
+                                    <v>448</v>
                                 </b>
                                 <b>
                                     <a>1234</a>
@@ -7645,12 +7663,12 @@
                                 <b>
                                     <a>352</a>
                                     <b>434</b>
-                                    <v>449</v>
+                                    <v>448</v>
                                 </b>
                                 <b>
                                     <a>434</a>
                                     <b>490</b>
-                                    <v>449</v>
+                                    <v>448</v>
                                 </b>
                                 <b>
                                     <a>490</a>
@@ -7665,7 +7683,7 @@
                                 <b>
                                     <a>706</a>
                                     <b>707</b>
-                                    <v>1347</v>
+                                    <v>1346</v>
                                 </b>
                                 <b>
                                     <a>710</a>
@@ -7769,62 +7787,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11163</v>
+                                    <v>11159</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4416</v>
+                                    <v>4414</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>5122</v>
+                                    <v>5120</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>4148</v>
+                                    <v>4147</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>4651</v>
+                                    <v>4649</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>4384</v>
+                                    <v>4382</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>19</b>
-                                    <v>4950</v>
+                                    <v>4949</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>27</b>
-                                    <v>4309</v>
+                                    <v>4307</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>47</b>
-                                    <v>4897</v>
+                                    <v>4895</v>
                                 </b>
                                 <b>
                                     <a>47</a>
                                     <b>128</b>
-                                    <v>4982</v>
+                                    <v>4981</v>
                                 </b>
                                 <b>
                                     <a>128</a>
                                     <b>459</b>
-                                    <v>4683</v>
+                                    <v>4681</v>
                                 </b>
                                 <b>
                                     <a>459</a>
                                     <b>546</b>
-                                    <v>1732</v>
+                                    <v>1731</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7840,7 +7858,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59443</v>
+                                    <v>59421</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7856,57 +7874,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11730</v>
+                                    <v>11726</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7784</v>
+                                    <v>7781</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4148</v>
+                                    <v>4147</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4116</v>
+                                    <v>4115</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>8</b>
-                                    <v>3464</v>
+                                    <v>3463</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>11</b>
-                                    <v>4801</v>
+                                    <v>4799</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>17</b>
-                                    <v>5464</v>
+                                    <v>5462</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>23</b>
-                                    <v>4758</v>
+                                    <v>4756</v>
                                 </b>
                                 <b>
                                     <a>23</a>
                                     <b>41</b>
-                                    <v>4737</v>
+                                    <v>4735</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>95</b>
-                                    <v>4523</v>
+                                    <v>4521</v>
                                 </b>
                                 <b>
                                     <a>95</a>
                                     <b>1726</b>
-                                    <v>3913</v>
+                                    <v>3912</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7922,27 +7940,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3400</v>
+                                    <v>3399</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1657</v>
+                                    <v>1656</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3229</v>
+                                    <v>3228</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>2491</v>
+                                    <v>2490</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>3004</v>
+                                    <v>3003</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -7952,42 +7970,42 @@
                                 <b>
                                     <a>17</a>
                                     <b>24</b>
-                                    <v>3079</v>
+                                    <v>3078</v>
                                 </b>
                                 <b>
                                     <a>24</a>
                                     <b>51</b>
-                                    <v>3582</v>
+                                    <v>3580</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>58</b>
-                                    <v>3068</v>
+                                    <v>3067</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>80</b>
-                                    <v>3015</v>
+                                    <v>3014</v>
                                 </b>
                                 <b>
                                     <a>81</a>
                                     <b>151</b>
-                                    <v>3122</v>
+                                    <v>3121</v>
                                 </b>
                                 <b>
                                     <a>151</a>
                                     <b>334</b>
-                                    <v>3015</v>
+                                    <v>3014</v>
                                 </b>
                                 <b>
                                     <a>334</a>
                                     <b>473</b>
-                                    <v>3036</v>
+                                    <v>3035</v>
                                 </b>
                                 <b>
                                     <a>473</a>
                                     <b>547</b>
-                                    <v>2341</v>
+                                    <v>2340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8003,7 +8021,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39992</v>
+                                    <v>39977</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8024,67 +8042,67 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3443</v>
+                                    <v>3441</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>1935</v>
+                                    <v>1934</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3090</v>
+                                    <v>3089</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>2512</v>
+                                    <v>2511</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>3528</v>
+                                    <v>3527</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>3496</v>
+                                    <v>3495</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>28</b>
-                                    <v>3240</v>
+                                    <v>3238</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>34</b>
-                                    <v>3186</v>
+                                    <v>3185</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>41</b>
-                                    <v>3240</v>
+                                    <v>3238</v>
                                 </b>
                                 <b>
                                     <a>41</a>
                                     <b>66</b>
-                                    <v>3026</v>
+                                    <v>3025</v>
                                 </b>
                                 <b>
                                     <a>66</a>
                                     <b>92</b>
-                                    <v>3111</v>
+                                    <v>3110</v>
                                 </b>
                                 <b>
                                     <a>92</a>
                                     <b>113</b>
-                                    <v>3026</v>
+                                    <v>3025</v>
                                 </b>
                                 <b>
                                     <a>113</a>
                                     <b>145</b>
-                                    <v>3068</v>
+                                    <v>3067</v>
                                 </b>
                                 <b>
                                     <a>145</a>
@@ -8099,15 +8117,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>149973979</cardinality>
+            <cardinality>149972783</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24663860</v>
+                    <v>24663663</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3704596</v>
+                    <v>3704566</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8121,37 +8139,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>2207729</v>
+                                    <v>2207711</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1468685</v>
+                                    <v>1468674</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1626701</v>
+                                    <v>1626688</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>6580830</v>
+                                    <v>6580777</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>8716496</v>
+                                    <v>8716427</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>3556027</v>
+                                    <v>3555999</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>22</b>
-                                    <v>507389</v>
+                                    <v>507385</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8167,32 +8185,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>529077</v>
+                                    <v>529073</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>740947</v>
+                                    <v>740941</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>480815</v>
+                                    <v>480811</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>280651</v>
+                                    <v>280649</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>282072</v>
+                                    <v>282069</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>330155</v>
+                                    <v>330153</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -8202,22 +8220,22 @@
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>444522</v>
+                                    <v>444519</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>307708</v>
+                                    <v>307705</v>
                                 </b>
                                 <b>
                                     <a>339</a>
                                     <b>423</b>
-                                    <v>281674</v>
+                                    <v>281672</v>
                                 </b>
                                 <b>
                                     <a>423</a>
                                     <b>7616</b>
-                                    <v>23928</v>
+                                    <v>23927</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8227,15 +8245,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48637828</cardinality>
+            <cardinality>48637440</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7021712</v>
+                    <v>7021656</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3802035</v>
+                    <v>3802004</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8249,37 +8267,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3845602</v>
+                                    <v>3845572</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>766084</v>
+                                    <v>766078</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>361737</v>
+                                    <v>361735</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>751511</v>
+                                    <v>751505</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>535006</v>
+                                    <v>535002</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>50</b>
-                                    <v>556107</v>
+                                    <v>556103</v>
                                 </b>
                                 <b>
                                     <a>50</a>
                                     <b>9900</b>
-                                    <v>205660</v>
+                                    <v>205658</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8295,62 +8313,62 @@
                                 <b>
                                     <a>1</a>
                                     <b>4</b>
-                                    <v>313742</v>
+                                    <v>313740</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>319104</v>
+                                    <v>319101</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>300107</v>
+                                    <v>300104</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>342542</v>
+                                    <v>342540</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>13</b>
-                                    <v>460448</v>
+                                    <v>460444</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>14</b>
-                                    <v>224633</v>
+                                    <v>224631</v>
                                 </b>
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>409403</v>
+                                    <v>409400</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>16</b>
-                                    <v>165317</v>
+                                    <v>165315</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>377187</v>
+                                    <v>377184</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>202389</v>
+                                    <v>202387</v>
                                 </b>
                                 <b>
                                     <a>18</a>
                                     <b>20</b>
-                                    <v>342019</v>
+                                    <v>342016</v>
                                 </b>
                                 <b>
                                     <a>20</a>
                                     <b>26</b>
-                                    <v>297274</v>
+                                    <v>297272</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -8365,19 +8383,19 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>40373865</cardinality>
+            <cardinality>40373543</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>40373865</v>
+                    <v>40373543</v>
                 </e>
                 <e>
                     <k>macro_id</k>
-                    <v>182367</v>
+                    <v>182365</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5923123</v>
+                    <v>5923076</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -8395,7 +8413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40373865</v>
+                                    <v>40373543</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8411,7 +8429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40373865</v>
+                                    <v>40373543</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8427,7 +8445,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40373865</v>
+                                    <v>40373543</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8443,12 +8461,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61079</v>
+                                    <v>61078</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27600</v>
+                                    <v>27599</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8499,7 +8517,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77628</v>
+                                    <v>77627</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8550,7 +8568,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>177848</v>
+                                    <v>177847</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8571,17 +8589,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5259361</v>
+                                    <v>5259319</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>429406</v>
+                                    <v>429403</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>72214</b>
-                                    <v>234355</v>
+                                    <v>234353</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8597,7 +8615,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5900967</v>
+                                    <v>5900919</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8618,7 +8636,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5923123</v>
+                                    <v>5923076</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8691,15 +8709,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>33673531</cardinality>
+            <cardinality>33673263</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33673531</v>
+                    <v>33673263</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>15935844</v>
+                    <v>15935717</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8713,7 +8731,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33673531</v>
+                                    <v>33673263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8729,27 +8747,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7812284</v>
+                                    <v>7812221</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1595250</v>
+                                    <v>1595237</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4705781</v>
+                                    <v>4705743</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1296657</v>
+                                    <v>1296647</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>205</b>
-                                    <v>525870</v>
+                                    <v>525866</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8759,15 +8777,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>6014601</cardinality>
+            <cardinality>6014113</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4204073</v>
+                    <v>4203558</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2268452</v>
+                    <v>2268486</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8781,12 +8799,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3282337</v>
+                                    <v>3281808</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>488105</v>
+                                    <v>488113</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8796,7 +8814,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>411988</v>
+                                    <v>411994</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -8817,27 +8835,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1330299</v>
+                                    <v>1330319</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>480271</v>
+                                    <v>480278</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7812</v>
+                                    <v>7813</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>426051</v>
+                                    <v>426058</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>522</b>
-                                    <v>24016</v>
+                                    <v>24017</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8847,11 +8865,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>83523288</cardinality>
+            <cardinality>83492408</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26610301</v>
+                    <v>26600368</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -8859,7 +8877,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>347515</v>
+                    <v>347387</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8873,22 +8891,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9798055</v>
+                                    <v>9794310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9894700</v>
+                                    <v>9891058</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5064942</v>
+                                    <v>5063078</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1852603</v>
+                                    <v>1851921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8904,22 +8922,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9982950</v>
+                                    <v>9979137</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9912504</v>
+                                    <v>9908855</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4906299</v>
+                                    <v>4904493</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1808547</v>
+                                    <v>1807881</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8935,7 +8953,7 @@
                                 <b>
                                     <a>46457</a>
                                     <b>46458</b>
-                                    <v>620</v>
+                                    <v>619</v>
                                 </b>
                                 <b>
                                     <a>46659</a>
@@ -8944,7 +8962,7 @@
                                 </b>
                                 <b>
                                     <a>646916</a>
-                                    <b>2488547</b>
+                                    <b>2488534</b>
                                     <v>32</v>
                                 </b>
                             </bs>
@@ -8961,7 +8979,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>620</v>
+                                    <v>619</v>
                                 </b>
                                 <b>
                                     <a>13</a>
@@ -8987,57 +9005,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40195</v>
+                                    <v>40180</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>63078</v>
+                                    <v>63055</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>21247</v>
+                                    <v>21239</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>35126</v>
+                                    <v>35113</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>39746</v>
+                                    <v>39731</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>31191</v>
+                                    <v>31180</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>29331</v>
+                                    <v>29320</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>26198</v>
+                                    <v>26188</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>57</b>
-                                    <v>27481</v>
+                                    <v>27471</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>517</b>
-                                    <v>26337</v>
+                                    <v>26327</v>
                                 </b>
                                 <b>
                                     <a>518</a>
                                     <b>486640</b>
-                                    <v>7581</v>
+                                    <v>7578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9053,17 +9071,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>246187</v>
+                                    <v>246096</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>90987</v>
+                                    <v>90954</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>10340</v>
+                                    <v>10336</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9073,11 +9091,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>83523288</cardinality>
+            <cardinality>83492408</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26610301</v>
+                    <v>26600368</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -9085,7 +9103,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>210472</v>
+                    <v>210395</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9099,22 +9117,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9798055</v>
+                                    <v>9794310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9894700</v>
+                                    <v>9891058</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5064942</v>
+                                    <v>5063078</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1852603</v>
+                                    <v>1851921</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9130,22 +9148,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12794618</v>
+                                    <v>12789770</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8535135</v>
+                                    <v>8531993</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4277907</v>
+                                    <v>4276333</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>1002639</v>
+                                    <v>1002270</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9161,7 +9179,7 @@
                                 <b>
                                     <a>46457</a>
                                     <b>46458</b>
-                                    <v>620</v>
+                                    <v>619</v>
                                 </b>
                                 <b>
                                     <a>46659</a>
@@ -9170,7 +9188,7 @@
                                 </b>
                                 <b>
                                     <a>646916</a>
-                                    <b>2488547</b>
+                                    <b>2488534</b>
                                     <v>32</v>
                                 </b>
                             </bs>
@@ -9213,57 +9231,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>22102</v>
+                                    <v>22094</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>27139</v>
+                                    <v>27129</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>44012</v>
+                                    <v>43996</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>16253</v>
+                                    <v>16247</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>3314</v>
+                                    <v>3313</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>18520</v>
+                                    <v>18513</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>19194</v>
+                                    <v>19187</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>18541</v>
+                                    <v>18535</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>51</b>
-                                    <v>15964</v>
+                                    <v>15958</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>251</b>
-                                    <v>15793</v>
+                                    <v>15787</v>
                                 </b>
                                 <b>
                                     <a>251</a>
-                                    <b>1169187</b>
-                                    <v>9634</v>
+                                    <b>1169174</b>
+                                    <v>9630</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9279,17 +9297,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>106353</v>
+                                    <v>106314</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>90014</v>
+                                    <v>89981</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>66</b>
-                                    <v>14104</v>
+                                    <v>14099</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9299,15 +9317,15 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>3995810</cardinality>
+            <cardinality>3995778</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3995810</v>
+                    <v>3995778</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1666640</v>
+                    <v>1666626</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -9325,7 +9343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3995810</v>
+                                    <v>3995778</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9341,7 +9359,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3995810</v>
+                                    <v>3995778</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9357,17 +9375,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1422058</v>
+                                    <v>1422047</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>138497</v>
+                                    <v>138496</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>3162</b>
-                                    <v>106083</v>
+                                    <v>106082</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9383,7 +9401,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1663816</v>
+                                    <v>1663802</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9490,26 +9508,26 @@
         </relation>
         <relation>
             <name>builtin_functions</name>
-            <cardinality>31213</cardinality>
+            <cardinality>31201</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>31213</v>
+                    <v>31201</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1131527</cardinality>
+            <cardinality>1131444</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1128150</v>
+                    <v>1128067</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1131527</v>
+                    <v>1131444</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9523,7 +9541,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1125314</v>
+                                    <v>1125231</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9544,7 +9562,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1131527</v>
+                                    <v>1131444</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9554,15 +9572,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4012877</cardinality>
+            <cardinality>4012845</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3995810</v>
+                    <v>3995778</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>611084</v>
+                    <v>611080</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9576,7 +9594,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3978744</v>
+                                    <v>3978712</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9597,12 +9615,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>304867</v>
+                                    <v>304864</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>211921</v>
+                                    <v>211919</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -9897,44 +9915,44 @@
         </relation>
         <relation>
             <name>purefunctions</name>
-            <cardinality>131114</cardinality>
+            <cardinality>131113</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>131114</v>
+                    <v>131113</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>87628</cardinality>
+            <cardinality>87630</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>87628</v>
+                    <v>87630</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>51425</cardinality>
+            <cardinality>51426</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>51425</v>
+                    <v>51426</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>3994337</cardinality>
+            <cardinality>3994305</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3994337</v>
+                    <v>3994305</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -10014,15 +10032,15 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>670714</cardinality>
+            <cardinality>671002</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>670714</v>
+                    <v>671002</v>
                 </e>
                 <e>
                     <k>this_type</k>
-                    <v>227880</v>
+                    <v>227957</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10036,7 +10054,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>670714</v>
+                                    <v>671002</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10052,32 +10070,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100108</v>
+                                    <v>100146</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>59175</v>
+                                    <v>59164</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>22091</v>
+                                    <v>22137</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>13879</v>
+                                    <v>13853</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>18520</v>
+                                    <v>18535</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>152</b>
-                                    <v>14104</v>
+                                    <v>14120</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10087,27 +10105,27 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4155304</cardinality>
+            <cardinality>4155271</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4149410</v>
+                    <v>4149377</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3975060</v>
+                    <v>3975028</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>604209</v>
+                    <v>604204</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1665166</v>
+                    <v>1665153</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2768852</v>
+                    <v>2768830</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10121,7 +10139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4149410</v>
+                                    <v>4149377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10137,7 +10155,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4143517</v>
+                                    <v>4143484</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10158,7 +10176,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4149410</v>
+                                    <v>4149377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10174,7 +10192,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4149410</v>
+                                    <v>4149377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10190,12 +10208,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3815567</v>
+                                    <v>3815536</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>159493</v>
+                                    <v>159492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10211,7 +10229,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3957011</v>
+                                    <v>3956980</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10232,7 +10250,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3975060</v>
+                                    <v>3975028</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10248,12 +10266,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3836562</v>
+                                    <v>3836532</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>138497</v>
+                                    <v>138496</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10269,22 +10287,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>290256</v>
+                                    <v>290253</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>219288</v>
+                                    <v>219286</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48376</v>
+                                    <v>48375</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>506</b>
-                                    <v>45429</v>
+                                    <v>45428</v>
                                 </b>
                                 <b>
                                     <a>555</a>
@@ -10305,17 +10323,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>300815</v>
+                                    <v>300812</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>210447</v>
+                                    <v>210446</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>47639</v>
+                                    <v>47638</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -10336,17 +10354,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>486093</v>
+                                    <v>486089</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52305</v>
+                                    <v>52304</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>49358</v>
+                                    <v>49357</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -10367,7 +10385,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>449258</v>
+                                    <v>449255</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10382,7 +10400,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>4756</b>
-                                    <v>30327</v>
+                                    <v>30326</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10398,17 +10416,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1310327</v>
+                                    <v>1310316</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>190925</v>
+                                    <v>190924</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>127693</v>
+                                    <v>127692</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -10429,17 +10447,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1421567</v>
+                                    <v>1421556</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>138988</v>
+                                    <v>138987</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>3162</b>
-                                    <v>104610</v>
+                                    <v>104609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10455,7 +10473,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1576763</v>
+                                    <v>1576751</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10476,17 +10494,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1345688</v>
+                                    <v>1345677</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>205045</v>
+                                    <v>205043</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>1592</b>
-                                    <v>114432</v>
+                                    <v>114431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10502,17 +10520,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2376564</v>
+                                    <v>2376545</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>251948</v>
+                                    <v>251946</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>211</b>
-                                    <v>140339</v>
+                                    <v>140338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10528,17 +10546,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2396332</v>
+                                    <v>2396313</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>232671</v>
+                                    <v>232669</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>211</b>
-                                    <v>139848</v>
+                                    <v>139847</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10554,12 +10572,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2655893</v>
+                                    <v>2655871</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>211</b>
-                                    <v>112959</v>
+                                    <v>112958</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10575,7 +10593,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2730298</v>
+                                    <v>2730276</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10590,11 +10608,11 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1397747</cardinality>
+            <cardinality>1397736</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1397747</v>
+                    <v>1397736</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -10623,11 +10641,11 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>4215835</cardinality>
+            <cardinality>4215802</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1724347</v>
+                    <v>1724333</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -10645,17 +10663,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>360855</v>
+                                    <v>360852</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>258087</v>
+                                    <v>258085</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1082812</v>
+                                    <v>1082804</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -10857,26 +10875,26 @@
         </relation>
         <relation>
             <name>fun_decl_empty_throws</name>
-            <cardinality>434681</cardinality>
+            <cardinality>434678</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>434681</v>
+                    <v>434678</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>140571</cardinality>
+            <cardinality>140561</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>140571</v>
+                    <v>140561</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>140132</v>
+                    <v>140122</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10890,7 +10908,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>140571</v>
+                                    <v>140561</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10906,7 +10924,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>139693</v>
+                                    <v>139683</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10921,11 +10939,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>1156481</cardinality>
+            <cardinality>1156472</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1156481</v>
+                    <v>1156472</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -11030,7 +11048,7 @@
         </relation>
         <relation>
             <name>fun_requires</name>
-            <cardinality>28966</cardinality>
+            <cardinality>28967</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -11160,7 +11178,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28495</v>
+                                    <v>28496</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11191,19 +11209,19 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7220306</cardinality>
+            <cardinality>7220248</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7220306</v>
+                    <v>7220248</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7858</v>
+                    <v>7857</v>
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3489335</v>
+                    <v>3489307</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11217,7 +11235,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7220306</v>
+                                    <v>7220248</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11233,7 +11251,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7220306</v>
+                                    <v>7220248</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11249,7 +11267,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3929</v>
+                                    <v>3928</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -11290,7 +11308,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3929</v>
+                                    <v>3928</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -11331,27 +11349,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1486764</v>
+                                    <v>1486752</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>972677</v>
+                                    <v>972669</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>592544</v>
+                                    <v>592540</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>285958</v>
+                                    <v>285956</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>151389</v>
+                                    <v>151388</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11367,27 +11385,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1486764</v>
+                                    <v>1486752</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>972677</v>
+                                    <v>972669</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>592544</v>
+                                    <v>592540</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>285958</v>
+                                    <v>285956</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>151389</v>
+                                    <v>151388</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11397,27 +11415,27 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>9417486</cardinality>
+            <cardinality>9417411</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9411101</v>
+                    <v>9411026</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>9072837</v>
+                    <v>9072765</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1441089</v>
+                    <v>1441078</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>839090</v>
+                    <v>839084</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6177029</v>
+                    <v>6176980</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11431,7 +11449,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9411101</v>
+                                    <v>9411026</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11447,7 +11465,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9404717</v>
+                                    <v>9404642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11468,7 +11486,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9411101</v>
+                                    <v>9411026</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11484,7 +11502,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9411101</v>
+                                    <v>9411026</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11500,12 +11518,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8752254</v>
+                                    <v>8752184</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>320583</v>
+                                    <v>320580</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11521,12 +11539,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9020532</v>
+                                    <v>9020460</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>52305</v>
+                                    <v>52304</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11542,12 +11560,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8969087</v>
+                                    <v>8969015</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>103750</v>
+                                    <v>103749</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11563,12 +11581,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8831448</v>
+                                    <v>8831378</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>241389</v>
+                                    <v>241387</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11584,27 +11602,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>839213</v>
+                                    <v>839206</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>280556</v>
+                                    <v>280554</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>127570</v>
+                                    <v>127569</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>112836</v>
+                                    <v>112835</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>2786</b>
-                                    <v>80913</v>
+                                    <v>80912</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11620,22 +11638,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>860454</v>
+                                    <v>860447</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>265699</v>
+                                    <v>265697</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>122413</v>
+                                    <v>122412</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>11</b>
-                                    <v>112468</v>
+                                    <v>112467</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -11656,22 +11674,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1105036</v>
+                                    <v>1105027</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>191048</v>
+                                    <v>191046</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>116397</v>
+                                    <v>116396</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>1038</b>
-                                    <v>28608</v>
+                                    <v>28607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11687,22 +11705,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>974519</v>
+                                    <v>974511</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>215236</v>
+                                    <v>215234</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>104610</v>
+                                    <v>104609</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>15</b>
-                                    <v>109889</v>
+                                    <v>109888</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -11723,12 +11741,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>457239</v>
+                                    <v>457235</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>162194</v>
+                                    <v>162193</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -11738,12 +11756,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>64583</v>
+                                    <v>64582</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>24</b>
-                                    <v>63969</v>
+                                    <v>63968</v>
                                 </b>
                                 <b>
                                     <a>24</a>
@@ -11764,27 +11782,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>468166</v>
+                                    <v>468163</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>162194</v>
+                                    <v>162193</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>55129</v>
+                                    <v>55128</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>70845</v>
+                                    <v>70844</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>43</b>
-                                    <v>63355</v>
+                                    <v>63354</v>
                                 </b>
                                 <b>
                                     <a>43</a>
@@ -11805,7 +11823,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>642885</v>
+                                    <v>642880</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11815,7 +11833,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>64092</v>
+                                    <v>64091</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -11836,12 +11854,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>484865</v>
+                                    <v>484861</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>180980</v>
+                                    <v>180978</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -11851,12 +11869,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>63969</v>
+                                    <v>63968</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>22619</b>
-                                    <v>57953</v>
+                                    <v>57952</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11872,12 +11890,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5668589</v>
+                                    <v>5668544</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>16</b>
-                                    <v>468780</v>
+                                    <v>468777</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -11898,12 +11916,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5749257</v>
+                                    <v>5749211</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2935</b>
-                                    <v>427771</v>
+                                    <v>427768</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11919,12 +11937,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5876213</v>
+                                    <v>5876167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2555</b>
-                                    <v>300815</v>
+                                    <v>300812</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11940,7 +11958,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6164873</v>
+                                    <v>6164824</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11955,11 +11973,11 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3684804</cardinality>
+            <cardinality>3684775</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3684804</v>
+                    <v>3684775</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -11977,11 +11995,11 @@
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>481672</cardinality>
+            <cardinality>481669</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>481672</v>
+                    <v>481669</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -11999,7 +12017,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>481672</v>
+                                    <v>481669</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12109,19 +12127,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>1639750</cardinality>
+            <cardinality>1639737</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1639750</v>
+                    <v>1639737</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1621088</v>
+                    <v>1621075</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1543612</v>
+                    <v>1543600</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12135,7 +12153,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1639750</v>
+                                    <v>1639737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12151,7 +12169,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1639750</v>
+                                    <v>1639737</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12167,7 +12185,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1605003</v>
+                                    <v>1604990</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12188,7 +12206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1605126</v>
+                                    <v>1605113</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12209,7 +12227,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513531</v>
+                                    <v>1513519</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12230,7 +12248,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1513653</v>
+                                    <v>1513641</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12245,22 +12263,22 @@
         </relation>
         <relation>
             <name>type_def</name>
-            <cardinality>1092512</cardinality>
+            <cardinality>1092503</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1092512</v>
+                    <v>1092503</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>676228</cardinality>
+            <cardinality>676223</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>676228</v>
+                    <v>676223</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -12340,11 +12358,11 @@
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>406675</cardinality>
+            <cardinality>406672</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>406675</v>
+                    <v>406672</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
@@ -12352,11 +12370,11 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>406675</v>
+                    <v>406672</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>406675</v>
+                    <v>406672</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12370,7 +12388,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406675</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12386,7 +12404,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406675</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12402,7 +12420,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406675</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12616,7 +12634,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406675</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12632,7 +12650,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406675</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12648,7 +12666,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406675</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12664,7 +12682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406675</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12680,7 +12698,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406675</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12696,7 +12714,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406675</v>
+                                    <v>406672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12706,19 +12724,19 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>275176</cardinality>
+            <cardinality>275545</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>275176</v>
+                    <v>275545</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>59517</v>
+                    <v>59966</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>27181</v>
+                    <v>27171</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12736,7 +12754,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>275176</v>
+                                    <v>275545</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12752,7 +12770,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>275176</v>
+                                    <v>275545</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12768,7 +12786,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>275176</v>
+                                    <v>275545</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12784,17 +12802,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51701</v>
+                                    <v>52152</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5442</v>
+                                    <v>5440</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>134</b>
-                                    <v>2373</v>
+                                    <v>2372</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12810,17 +12828,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51701</v>
+                                    <v>52152</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5442</v>
+                                    <v>5440</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>134</b>
-                                    <v>2373</v>
+                                    <v>2372</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12836,7 +12854,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59517</v>
+                                    <v>59966</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12852,21 +12870,21 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21450</v>
+                                    <v>21442</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2320</v>
+                                    <v>2319</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1967</v>
+                                    <v>1966</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>364</b>
+                                    <b>370</b>
                                     <v>1443</v>
                                 </b>
                             </bs>
@@ -12883,21 +12901,21 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21450</v>
+                                    <v>21442</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2320</v>
+                                    <v>2319</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1967</v>
+                                    <v>1966</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>364</b>
+                                    <b>370</b>
                                     <v>1443</v>
                                 </b>
                             </bs>
@@ -12914,7 +12932,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27181</v>
+                                    <v>27171</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12933,8 +12951,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>25341</a>
-                                    <b>25342</b>
+                                    <a>25385</a>
+                                    <b>25386</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -12954,8 +12972,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>5352</a>
-                                    <b>5353</b>
+                                    <a>5396</a>
+                                    <b>5397</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -12987,15 +13005,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>582165</cardinality>
+            <cardinality>582421</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>20541</v>
+                    <v>20619</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>275176</v>
+                    <v>275545</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13009,27 +13027,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9131</v>
+                                    <v>9139</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1625</v>
+                                    <v>1614</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>1785</v>
+                                    <v>1795</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2288</v>
+                                    <v>2362</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>26</b>
-                                    <v>1550</v>
+                                    <v>1549</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -13039,12 +13057,12 @@
                                 <b>
                                     <a>145</a>
                                     <b>146</b>
-                                    <v>2651</v>
+                                    <v>2650</v>
                                 </b>
                                 <b>
                                     <a>146</a>
                                     <b>437</b>
-                                    <v>695</v>
+                                    <v>694</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13060,27 +13078,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>98184</v>
+                                    <v>98618</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>121848</v>
+                                    <v>121803</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>19964</v>
+                                    <v>19956</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>26839</v>
+                                    <v>26829</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>8340</v>
+                                    <v>8337</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13090,15 +13108,15 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>172120</cardinality>
+            <cardinality>172118</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>172120</v>
+                    <v>172118</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>172120</v>
+                    <v>172118</v>
                 </e>
                 <e>
                     <k>message</k>
@@ -13106,11 +13124,11 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>22499</v>
+                    <v>22498</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>6220</v>
+                    <v>6219</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13124,7 +13142,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172120</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13140,7 +13158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172120</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13156,7 +13174,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172120</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13172,7 +13190,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172120</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13188,7 +13206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172120</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13204,7 +13222,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172120</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13220,7 +13238,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172120</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13236,7 +13254,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172120</v>
+                                    <v>172118</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13272,7 +13290,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>17</b>
-                                    <v>3110</v>
+                                    <v>3109</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -13313,7 +13331,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>17</b>
-                                    <v>3110</v>
+                                    <v>3109</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -13698,23 +13716,23 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>6972041</cardinality>
+            <cardinality>6971985</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6932137</v>
+                    <v>6932082</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3362133</v>
+                    <v>3362107</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>7858</v>
+                    <v>7857</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1206945</v>
+                    <v>1206935</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13728,7 +13746,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6932137</v>
+                                    <v>6932082</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13744,7 +13762,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6932137</v>
+                                    <v>6932082</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13760,12 +13778,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6892233</v>
+                                    <v>6892178</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>39904</v>
+                                    <v>39903</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13781,27 +13799,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1450912</v>
+                                    <v>1450900</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>920495</v>
+                                    <v>920487</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>570198</v>
+                                    <v>570194</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>276504</v>
+                                    <v>276502</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>144023</v>
+                                    <v>144021</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13817,27 +13835,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1450912</v>
+                                    <v>1450900</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>920495</v>
+                                    <v>920487</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>570198</v>
+                                    <v>570194</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>276504</v>
+                                    <v>276502</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>144023</v>
+                                    <v>144021</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13853,22 +13871,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1757744</v>
+                                    <v>1757730</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1020071</v>
+                                    <v>1020063</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>431455</v>
+                                    <v>431451</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>11</b>
-                                    <v>152863</v>
+                                    <v>152862</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13884,7 +13902,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3929</v>
+                                    <v>3928</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -13925,7 +13943,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3929</v>
+                                    <v>3928</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -13966,7 +13984,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3929</v>
+                                    <v>3928</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14007,12 +14025,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>728832</v>
+                                    <v>728826</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>237091</v>
+                                    <v>237089</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14022,12 +14040,12 @@
                                 <b>
                                     <a>5</a>
                                     <b>13</b>
-                                    <v>93559</v>
+                                    <v>93558</v>
                                 </b>
                                 <b>
                                     <a>13</a>
                                     <b>2574</b>
-                                    <v>54515</v>
+                                    <v>54514</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14043,22 +14061,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>810850</v>
+                                    <v>810844</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>175823</v>
+                                    <v>175822</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>107065</v>
+                                    <v>107064</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>27</b>
-                                    <v>90858</v>
+                                    <v>90857</v>
                                 </b>
                                 <b>
                                     <a>27</a>
@@ -14079,17 +14097,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>981886</v>
+                                    <v>981878</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>167719</v>
+                                    <v>167718</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>65</b>
-                                    <v>57339</v>
+                                    <v>57338</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14099,11 +14117,11 @@
         </relation>
         <relation>
             <name>overrides</name>
-            <cardinality>160157</cardinality>
+            <cardinality>160156</cardinality>
             <columnsizes>
                 <e>
                     <k>new</k>
-                    <v>151386</v>
+                    <v>151385</v>
                 </e>
                 <e>
                     <k>old</k>
@@ -14121,7 +14139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>142623</v>
+                                    <v>142622</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14147,7 +14165,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2373</v>
+                                    <v>2372</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14177,19 +14195,19 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1504665</cardinality>
+            <cardinality>1504653</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1502215</v>
+                    <v>1502203</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>457823</v>
+                    <v>457819</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>644001</v>
+                    <v>643996</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14203,7 +14221,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1499874</v>
+                                    <v>1499862</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14224,7 +14242,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1502215</v>
+                                    <v>1502203</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14240,7 +14258,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>339692</v>
+                                    <v>339690</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14271,7 +14289,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>357276</v>
+                                    <v>357273</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14302,22 +14320,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>423200</v>
+                                    <v>423197</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>122539</v>
+                                    <v>122538</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>58085</v>
+                                    <v>58084</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>664</b>
-                                    <v>40175</v>
+                                    <v>40174</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14333,17 +14351,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>526197</v>
+                                    <v>526193</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>73273</v>
+                                    <v>73272</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>668</b>
-                                    <v>44530</v>
+                                    <v>44529</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14353,11 +14371,11 @@
         </relation>
         <relation>
             <name>globalvariables</name>
-            <cardinality>634536</cardinality>
+            <cardinality>634531</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>634536</v>
+                    <v>634531</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -14365,7 +14383,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>110749</v>
+                    <v>110748</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14379,7 +14397,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>634536</v>
+                                    <v>634531</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14395,7 +14413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>634536</v>
+                                    <v>634531</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14493,7 +14511,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>92700</v>
+                                    <v>92699</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14524,7 +14542,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>93928</v>
+                                    <v>93927</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14544,19 +14562,19 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>733038</cardinality>
+            <cardinality>733187</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>733038</v>
+                    <v>733187</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53913</v>
+                    <v>53924</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>102626</v>
+                    <v>102647</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14570,7 +14588,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>733038</v>
+                                    <v>733187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14586,7 +14604,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>733038</v>
+                                    <v>733187</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14602,22 +14620,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29150</v>
+                                    <v>29156</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7879</v>
+                                    <v>7881</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4081</v>
+                                    <v>4082</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4105</v>
+                                    <v>4106</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -14627,7 +14645,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>162</b>
-                                    <v>4044</v>
+                                    <v>4045</v>
                                 </b>
                                 <b>
                                     <a>162</a>
@@ -14648,22 +14666,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38683</v>
+                                    <v>38691</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6784</v>
+                                    <v>6786</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4521</v>
+                                    <v>4522</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>3509</b>
-                                    <v>3923</v>
+                                    <v>3924</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14679,27 +14697,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>63151</v>
+                                    <v>63163</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16195</v>
+                                    <v>16199</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6602</v>
+                                    <v>6604</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>8235</v>
+                                    <v>8237</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>137</b>
-                                    <v>7705</v>
+                                    <v>7707</v>
                                 </b>
                                 <b>
                                     <a>137</a>
@@ -14720,17 +14738,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>85412</v>
+                                    <v>85429</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8493</v>
+                                    <v>8495</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>7758</v>
+                                    <v>7760</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -14745,11 +14763,11 @@
         </relation>
         <relation>
             <name>autoderivation</name>
-            <cardinality>224076</cardinality>
+            <cardinality>224074</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>224076</v>
+                    <v>224074</v>
                 </e>
                 <e>
                     <k>derivation_type</k>
@@ -14767,7 +14785,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>224076</v>
+                                    <v>224074</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14813,15 +14831,15 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>43930</cardinality>
+            <cardinality>43927</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>43930</v>
+                    <v>43927</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>40689</v>
+                    <v>40686</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14835,7 +14853,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>43930</v>
+                                    <v>43927</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14851,7 +14869,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39844</v>
+                                    <v>39841</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14866,11 +14884,11 @@
         </relation>
         <relation>
             <name>enumconstants</name>
-            <cardinality>347913</cardinality>
+            <cardinality>347910</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>347913</v>
+                    <v>347910</v>
                 </e>
                 <e>
                     <k>parent</k>
@@ -14886,11 +14904,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>347531</v>
+                    <v>347529</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>320530</v>
+                    <v>320528</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14904,7 +14922,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347913</v>
+                                    <v>347910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14920,7 +14938,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347913</v>
+                                    <v>347910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14936,7 +14954,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347913</v>
+                                    <v>347910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14952,7 +14970,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347913</v>
+                                    <v>347910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14968,7 +14986,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347913</v>
+                                    <v>347910</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15584,7 +15602,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347150</v>
+                                    <v>347148</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15605,7 +15623,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347150</v>
+                                    <v>347148</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15626,7 +15644,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347531</v>
+                                    <v>347529</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15642,7 +15660,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347531</v>
+                                    <v>347529</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15658,7 +15676,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347150</v>
+                                    <v>347148</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15679,7 +15697,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>319496</v>
+                                    <v>319493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15700,7 +15718,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>320530</v>
+                                    <v>320528</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15716,7 +15734,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>319496</v>
+                                    <v>319493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15737,7 +15755,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>320530</v>
+                                    <v>320528</v>
                                 </b>
                             </bs>
                         </hist>
@@ -15753,7 +15771,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>319496</v>
+                                    <v>319493</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16460,15 +16478,15 @@
         </relation>
         <relation>
             <name>bit_precise_int_types</name>
-            <cardinality>8</cardinality>
+            <cardinality>11</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8</v>
+                    <v>11</v>
                 </e>
                 <e>
                     <k>bit_width</k>
-                    <v>4</v>
+                    <v>6</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16482,7 +16500,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8</v>
+                                    <v>11</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16498,12 +16516,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1</v>
+                                    <v>2</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2</v>
+                                    <v>3</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16518,15 +16536,15 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>2998331</cardinality>
+            <cardinality>2998307</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2998331</v>
+                    <v>2998307</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1445632</v>
+                    <v>1445621</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16534,7 +16552,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1926078</v>
+                    <v>1926062</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16548,7 +16566,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2998331</v>
+                                    <v>2998307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16564,7 +16582,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2998331</v>
+                                    <v>2998307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16580,7 +16598,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2998331</v>
+                                    <v>2998307</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16596,12 +16614,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1328130</v>
+                                    <v>1328120</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>23</b>
-                                    <v>108784</v>
+                                    <v>108783</v>
                                 </b>
                                 <b>
                                     <a>23</a>
@@ -16622,7 +16640,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1445632</v>
+                                    <v>1445621</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16638,7 +16656,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1328253</v>
+                                    <v>1328242</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16787,22 +16805,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1303205</v>
+                                    <v>1303195</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372519</v>
+                                    <v>372516</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>121676</v>
+                                    <v>121675</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>137</b>
-                                    <v>128675</v>
+                                    <v>128674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16818,22 +16836,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1304679</v>
+                                    <v>1304668</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>372519</v>
+                                    <v>372516</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>120203</v>
+                                    <v>120202</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>137</b>
-                                    <v>128675</v>
+                                    <v>128674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16849,22 +16867,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1305047</v>
+                                    <v>1305037</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>373133</v>
+                                    <v>373130</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>121922</v>
+                                    <v>121921</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>125974</v>
+                                    <v>125973</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16874,11 +16892,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2221736</cardinality>
+            <cardinality>2221718</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2221736</v>
+                    <v>2221718</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -16900,7 +16918,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2221736</v>
+                                    <v>2221718</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16916,7 +16934,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2221736</v>
+                                    <v>2221718</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17000,11 +17018,11 @@
         </relation>
         <relation>
             <name>arraysizes</name>
-            <cardinality>79317</cardinality>
+            <cardinality>79316</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>79317</v>
+                    <v>79316</v>
                 </e>
                 <e>
                     <k>num_elements</k>
@@ -17030,7 +17048,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79317</v>
+                                    <v>79316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17046,7 +17064,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79317</v>
+                                    <v>79316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17062,7 +17080,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79317</v>
+                                    <v>79316</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17083,7 +17101,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>10682</v>
+                                    <v>10681</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17129,7 +17147,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3929</v>
+                                    <v>3928</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17160,7 +17178,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3929</v>
+                                    <v>3928</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17263,7 +17281,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14611</v>
+                                    <v>14610</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17439,15 +17457,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1791267</cardinality>
+            <cardinality>1791463</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1791267</v>
+                    <v>1791463</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>851342</v>
+                    <v>851307</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17461,7 +17479,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1791267</v>
+                                    <v>1791463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17477,22 +17495,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>673623</v>
+                                    <v>673460</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>82048</v>
+                                    <v>82124</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>64928</v>
+                                    <v>64968</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4525</b>
-                                    <v>30742</v>
+                                    <v>30752</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17502,7 +17520,7 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>814253</cardinality>
+            <cardinality>814246</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -17510,7 +17528,7 @@
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>814253</v>
+                    <v>814246</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17640,7 +17658,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814253</v>
+                                    <v>814246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17656,7 +17674,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814253</v>
+                                    <v>814246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17672,7 +17690,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814253</v>
+                                    <v>814246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17688,7 +17706,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814253</v>
+                                    <v>814246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18070,7 +18088,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7172</v>
+                                    <v>7171</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18189,7 +18207,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>942</v>
+                                    <v>941</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18266,15 +18284,15 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4280805</cardinality>
+            <cardinality>4280384</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4280805</v>
+                    <v>4280384</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>966486</v>
+                    <v>966130</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -18292,7 +18310,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4280805</v>
+                                    <v>4280384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18308,7 +18326,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4280805</v>
+                                    <v>4280384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18324,22 +18342,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>692667</v>
+                                    <v>692231</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>163369</v>
+                                    <v>163458</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>73996</v>
+                                    <v>74001</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>33429</b>
-                                    <v>36452</v>
+                                    <v>36439</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18355,12 +18373,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>913640</v>
+                                    <v>913304</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>52845</v>
+                                    <v>52825</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18394,8 +18412,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>1557</a>
-                                    <b>1558</b>
+                                    <a>1559</a>
+                                    <b>1560</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18409,13 +18427,13 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>20074</a>
-                                    <b>20075</b>
+                                    <a>20075</a>
+                                    <b>20076</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>21713</a>
-                                    <b>21714</b>
+                                    <a>21724</a>
+                                    <b>21725</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18424,13 +18442,13 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>98810</a>
-                                    <b>98811</b>
+                                    <a>98824</a>
+                                    <b>98825</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>167516</a>
-                                    <b>167517</b>
+                                    <a>167596</a>
+                                    <b>167597</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18512,15 +18530,15 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1445377</cardinality>
+            <cardinality>1444984</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1445377</v>
+                    <v>1444984</v>
                 </e>
                 <e>
                     <k>size</k>
-                    <v>1497</v>
+                    <v>1496</v>
                 </e>
                 <e>
                     <k>alignment</k>
@@ -18538,7 +18556,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1445377</v>
+                                    <v>1444984</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18554,7 +18572,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1445377</v>
+                                    <v>1444984</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18609,12 +18627,12 @@
                                 </b>
                                 <b>
                                     <a>118</a>
-                                    <b>1731</b>
+                                    <b>1735</b>
                                     <v>117</v>
                                 </b>
                                 <b>
                                     <a>1840</a>
-                                    <b>105869</b>
+                                    <b>105871</b>
                                     <v>53</v>
                                 </b>
                             </bs>
@@ -18631,7 +18649,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1219</v>
+                                    <v>1218</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18680,18 +18698,18 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>2042</a>
-                                    <b>2043</b>
+                                    <a>2044</a>
+                                    <b>2045</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>11942</a>
-                                    <b>11943</b>
+                                    <a>11951</a>
+                                    <b>11952</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>121064</a>
-                                    <b>121065</b>
+                                    <a>121066</a>
+                                    <b>121067</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18767,7 +18785,7 @@
                 </e>
                 <e>
                     <k>uuid</k>
-                    <v>47209</v>
+                    <v>47208</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18812,11 +18830,11 @@
         </relation>
         <relation>
             <name>usertype_alias_kind</name>
-            <cardinality>1791267</cardinality>
+            <cardinality>1791463</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1791267</v>
+                    <v>1791463</v>
                 </e>
                 <e>
                     <k>alias_kind</k>
@@ -18834,7 +18852,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1791267</v>
+                                    <v>1791463</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18848,13 +18866,13 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>36937</a>
-                                    <b>36938</b>
+                                    <a>36949</a>
+                                    <b>36950</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>130579</a>
-                                    <b>130580</b>
+                                    <a>130647</a>
+                                    <b>130648</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -18865,18 +18883,18 @@
         </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>758842</cardinality>
+            <cardinality>758786</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>758842</v>
+                    <v>758786</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_template_type_constraint</name>
-            <cardinality>27018</cardinality>
+            <cardinality>27019</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -18884,7 +18902,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>25883</v>
+                    <v>25884</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18949,15 +18967,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>8178495</cardinality>
+            <cardinality>8178430</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8178495</v>
+                    <v>8178430</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6345485</v>
+                    <v>6345435</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -18975,7 +18993,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8178495</v>
+                                    <v>8178430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18991,7 +19009,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8178495</v>
+                                    <v>8178430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19007,12 +19025,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5990769</v>
+                                    <v>5990721</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1120</b>
-                                    <v>354716</v>
+                                    <v>354713</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19028,7 +19046,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6345485</v>
+                                    <v>6345435</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19080,59 +19098,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>611214</cardinality>
+            <cardinality>611169</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>611214</v>
+                    <v>611169</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1203445</cardinality>
+            <cardinality>1203088</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1203445</v>
+                    <v>1203088</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1428043</cardinality>
+            <cardinality>1427635</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1428043</v>
+                    <v>1427635</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>235013</cardinality>
+            <cardinality>234937</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>235013</v>
+                    <v>234937</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1203980</cardinality>
+            <cardinality>1203697</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1200900</v>
+                    <v>1200629</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>73130</v>
+                    <v>73103</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19146,12 +19164,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1198740</v>
+                                    <v>1198481</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>2160</v>
+                                    <v>2148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19167,47 +19185,47 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20787</v>
+                                    <v>20779</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13034</v>
+                                    <v>13030</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>7217</v>
+                                    <v>7215</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>4758</v>
+                                    <v>4756</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>6330</v>
+                                    <v>6327</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>5752</v>
+                                    <v>5750</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>5956</v>
+                                    <v>5964</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>53</b>
-                                    <v>5560</v>
+                                    <v>5547</v>
                                 </b>
                                 <b>
                                     <a>53</a>
                                     <b>4358</b>
-                                    <v>3731</v>
+                                    <v>3730</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19217,11 +19235,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>3054583</cardinality>
+            <cardinality>3053715</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1448328</v>
+                    <v>1447923</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19229,7 +19247,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>860881</v>
+                    <v>860596</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19243,27 +19261,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>609999</v>
+                                    <v>609806</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>442010</v>
+                                    <v>441933</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>268054</v>
+                                    <v>267956</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>109807</v>
+                                    <v>109777</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>113</b>
-                                    <v>18456</v>
+                                    <v>18449</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19279,22 +19297,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>639063</v>
+                                    <v>638860</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>456788</v>
+                                    <v>456705</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>268151</v>
+                                    <v>268052</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>84325</v>
+                                    <v>84305</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19315,7 +19333,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>759</v>
+                                    <v>758</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -19334,12 +19352,12 @@
                                 </b>
                                 <b>
                                     <a>643</a>
-                                    <b>7142</b>
+                                    <b>7143</b>
                                     <v>96</v>
                                 </b>
                                 <b>
-                                    <a>11996</a>
-                                    <b>135434</b>
+                                    <a>11997</a>
+                                    <b>135446</b>
                                     <v>42</v>
                                 </b>
                             </bs>
@@ -19361,7 +19379,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>759</v>
+                                    <v>758</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -19385,7 +19403,7 @@
                                 </b>
                                 <b>
                                     <a>11131</a>
-                                    <b>46219</b>
+                                    <b>46221</b>
                                     <v>32</v>
                                 </b>
                             </bs>
@@ -19402,27 +19420,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>534431</v>
+                                    <v>534234</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>178008</v>
+                                    <v>177964</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>79385</v>
+                                    <v>79356</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>46</b>
-                                    <v>64693</v>
+                                    <v>64680</v>
                                 </b>
                                 <b>
                                     <a>46</a>
-                                    <b>13875</b>
-                                    <v>4362</v>
+                                    <b>13877</b>
+                                    <v>4361</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19438,17 +19456,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>752067</v>
+                                    <v>751823</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>89169</v>
+                                    <v>89137</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22</b>
-                                    <v>19643</v>
+                                    <v>19636</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19458,11 +19476,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>511973</cardinality>
+            <cardinality>511935</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>210401</v>
+                    <v>210385</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19470,7 +19488,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>511838</v>
+                    <v>511800</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19484,12 +19502,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>160831</v>
+                                    <v>160819</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42985</v>
+                                    <v>42982</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -19510,17 +19528,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>153031</v>
+                                    <v>153020</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>40115</v>
+                                    <v>40112</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>52</b>
-                                    <v>16005</v>
+                                    <v>16004</v>
                                 </b>
                                 <b>
                                     <a>54</a>
@@ -19653,7 +19671,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>511703</v>
+                                    <v>511665</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19674,7 +19692,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>511838</v>
+                                    <v>511800</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19684,15 +19702,15 @@
         </relation>
         <relation>
             <name>class_template_generated_from</name>
-            <cardinality>62608</cardinality>
+            <cardinality>62595</cardinality>
             <columnsizes>
                 <e>
                     <k>template</k>
-                    <v>62608</v>
+                    <v>62595</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>3806</v>
+                    <v>3805</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19706,7 +19724,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62608</v>
+                                    <v>62595</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19772,15 +19790,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>51198</cardinality>
+            <cardinality>51179</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>51198</v>
+                    <v>51179</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>47830</v>
+                    <v>47812</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19794,7 +19812,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51198</v>
+                                    <v>51179</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19810,7 +19828,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47060</v>
+                                    <v>47043</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19825,19 +19843,19 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>5937930</cardinality>
+            <cardinality>5937883</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5937930</v>
+                    <v>5937883</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>277905</v>
+                    <v>277903</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5881641</v>
+                    <v>5881594</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -19855,7 +19873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5937930</v>
+                                    <v>5937883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19871,7 +19889,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5937930</v>
+                                    <v>5937883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19887,7 +19905,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5937930</v>
+                                    <v>5937883</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19903,7 +19921,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137401</v>
+                                    <v>137400</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19933,7 +19951,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21013</v>
+                                    <v>21012</v>
                                 </b>
                                 <b>
                                     <a>28</a>
@@ -19954,7 +19972,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>137401</v>
+                                    <v>137400</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19984,7 +20002,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>28</b>
-                                    <v>21013</v>
+                                    <v>21012</v>
                                 </b>
                                 <b>
                                     <a>28</a>
@@ -20005,7 +20023,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>277905</v>
+                                    <v>277903</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20021,7 +20039,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5835968</v>
+                                    <v>5835921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20042,7 +20060,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5835968</v>
+                                    <v>5835921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20063,7 +20081,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5881641</v>
+                                    <v>5881594</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20121,26 +20139,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1311677</cardinality>
+            <cardinality>1311667</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1311677</v>
+                    <v>1311667</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>965225</cardinality>
+            <cardinality>965154</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>965225</v>
+                    <v>965154</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>181057</v>
+                    <v>181044</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20154,7 +20172,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>965225</v>
+                                    <v>965154</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20170,27 +20188,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>109539</v>
+                                    <v>109531</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42444</v>
+                                    <v>42441</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>14317</v>
+                                    <v>14316</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>104</b>
-                                    <v>13608</v>
+                                    <v>13607</v>
                                 </b>
                                 <b>
                                     <a>119</a>
                                     <b>1531</b>
-                                    <v>1148</v>
+                                    <v>1147</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20200,11 +20218,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2479028</cardinality>
+            <cardinality>2478845</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1456567</v>
+                    <v>1456460</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20212,7 +20230,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>295324</v>
+                    <v>295303</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20226,22 +20244,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>792170</v>
+                                    <v>792112</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>409524</v>
+                                    <v>409494</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>170320</v>
+                                    <v>170307</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>84552</v>
+                                    <v>84546</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20257,22 +20275,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>811147</v>
+                                    <v>811087</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>407633</v>
+                                    <v>407603</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>168158</v>
+                                    <v>168146</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>69627</v>
+                                    <v>69622</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20410,37 +20428,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173224</v>
+                                    <v>173211</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26034</v>
+                                    <v>26032</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>19652</v>
+                                    <v>19650</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>22590</v>
+                                    <v>22588</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>23096</v>
+                                    <v>23094</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>76</b>
-                                    <v>23096</v>
+                                    <v>23094</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>2452</b>
-                                    <v>7631</v>
+                                    <v>7630</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20456,12 +20474,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>254467</v>
+                                    <v>254448</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>31875</v>
+                                    <v>31873</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20476,11 +20494,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>456494</cardinality>
+            <cardinality>456460</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>194969</v>
+                    <v>194955</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20488,7 +20506,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>453826</v>
+                    <v>453793</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20502,12 +20520,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>149992</v>
+                                    <v>149981</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42512</v>
+                                    <v>42509</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20528,17 +20546,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>143137</v>
+                                    <v>143127</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36299</v>
+                                    <v>36296</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>54</b>
-                                    <v>14756</v>
+                                    <v>14755</v>
                                 </b>
                                 <b>
                                     <a>54</a>
@@ -20681,7 +20699,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>451159</v>
+                                    <v>451125</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20702,7 +20720,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>453826</v>
+                                    <v>453793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20712,15 +20730,15 @@
         </relation>
         <relation>
             <name>function_template_generated_from</name>
-            <cardinality>869530</cardinality>
+            <cardinality>869466</cardinality>
             <columnsizes>
                 <e>
                     <k>template</k>
-                    <v>869530</v>
+                    <v>869466</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>22286</v>
+                    <v>22284</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20734,7 +20752,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>869530</v>
+                                    <v>869466</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20750,7 +20768,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3613</v>
+                                    <v>3612</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20775,7 +20793,7 @@
                                 <b>
                                     <a>16</a>
                                     <b>20</b>
-                                    <v>1587</v>
+                                    <v>1586</v>
                                 </b>
                                 <b>
                                     <a>20</a>
@@ -20815,22 +20833,22 @@
         </relation>
         <relation>
             <name>is_variable_template</name>
-            <cardinality>57707</cardinality>
+            <cardinality>57706</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>57707</v>
+                    <v>57706</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>variable_instantiation</name>
-            <cardinality>566269</cardinality>
+            <cardinality>566265</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>566269</v>
+                    <v>566265</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -20848,7 +20866,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>566269</v>
+                                    <v>566265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20914,11 +20932,11 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>1073726</cardinality>
+            <cardinality>1073718</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
-                    <v>548711</v>
+                    <v>548707</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20926,7 +20944,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>461782</v>
+                    <v>461778</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20940,12 +20958,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>179998</v>
+                                    <v>179996</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>272698</v>
+                                    <v>272696</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20971,17 +20989,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>196205</v>
+                                    <v>196203</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>261402</v>
+                                    <v>261400</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>75633</v>
+                                    <v>75632</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -21104,12 +21122,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>361101</v>
+                                    <v>361098</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>56234</v>
+                                    <v>56233</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21135,7 +21153,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>429367</v>
+                                    <v>429364</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21202,7 +21220,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3929</v>
+                                    <v>3928</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -21359,26 +21377,26 @@
         </relation>
         <relation>
             <name>is_alias_template</name>
-            <cardinality>108155</cardinality>
+            <cardinality>108147</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>108155</v>
+                    <v>108147</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>alias_instantiation</name>
-            <cardinality>462909</cardinality>
+            <cardinality>462875</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>462909</v>
+                    <v>462875</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>92858</v>
+                    <v>92852</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21392,7 +21410,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>462909</v>
+                                    <v>462875</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21408,27 +21426,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16647</v>
+                                    <v>16645</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16917</v>
+                                    <v>16915</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20158</v>
+                                    <v>20157</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>12561</v>
+                                    <v>12560</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>6753</v>
+                                    <v>6752</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -21458,11 +21476,11 @@
         </relation>
         <relation>
             <name>alias_template_argument</name>
-            <cardinality>1000106</cardinality>
+            <cardinality>1000033</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>570997</v>
+                    <v>570955</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -21470,7 +21488,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>128617</v>
+                    <v>128608</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21484,22 +21502,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>278137</v>
+                                    <v>278117</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>183624</v>
+                                    <v>183610</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>87523</v>
+                                    <v>87517</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>21712</v>
+                                    <v>21710</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21515,22 +21533,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>279387</v>
+                                    <v>279366</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>182408</v>
+                                    <v>182395</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>88975</v>
+                                    <v>88969</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>10</b>
-                                    <v>20226</v>
+                                    <v>20224</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21658,27 +21676,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>78710</v>
+                                    <v>78704</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>20428</v>
+                                    <v>20427</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5470</v>
+                                    <v>5469</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>10535</v>
+                                    <v>10534</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>76</b>
-                                    <v>10906</v>
+                                    <v>10905</v>
                                 </b>
                                 <b>
                                     <a>84</a>
@@ -21699,12 +21717,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>109573</v>
+                                    <v>109565</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17423</v>
+                                    <v>17422</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21719,11 +21737,11 @@
         </relation>
         <relation>
             <name>alias_template_argument_value</name>
-            <cardinality>174405</cardinality>
+            <cardinality>174393</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>161743</v>
+                    <v>161731</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -21731,7 +21749,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>174405</v>
+                    <v>174393</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21745,7 +21763,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>160493</v>
+                                    <v>160482</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21766,7 +21784,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>159818</v>
+                                    <v>159806</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21849,7 +21867,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>174405</v>
+                                    <v>174393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21865,7 +21883,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>174405</v>
+                                    <v>174393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21875,11 +21893,11 @@
         </relation>
         <relation>
             <name>alias_template_generated_from</name>
-            <cardinality>100523</cardinality>
+            <cardinality>100516</cardinality>
             <columnsizes>
                 <e>
                     <k>template</k>
-                    <v>100523</v>
+                    <v>100516</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -21897,7 +21915,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>100523</v>
+                                    <v>100516</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21983,15 +22001,15 @@
         </relation>
         <relation>
             <name>template_template_instantiation</name>
-            <cardinality>6116</cardinality>
+            <cardinality>6114</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>5720</v>
+                    <v>5718</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>3977</v>
+                    <v>3976</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22005,7 +22023,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5603</v>
+                                    <v>5601</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22026,7 +22044,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2491</v>
+                                    <v>2490</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22046,11 +22064,11 @@
         </relation>
         <relation>
             <name>template_template_argument</name>
-            <cardinality>9794</cardinality>
+            <cardinality>9791</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>6191</v>
+                    <v>6189</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22058,7 +22076,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>9196</v>
+                    <v>9192</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22072,7 +22090,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5079</v>
+                                    <v>5077</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22103,7 +22121,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5100</v>
+                                    <v>5098</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22256,7 +22274,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9163</v>
+                                    <v>9160</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -22277,7 +22295,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9174</v>
+                                    <v>9171</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22524,11 +22542,11 @@
         </relation>
         <relation>
             <name>concept_instantiation</name>
-            <cardinality>90176</cardinality>
+            <cardinality>90178</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>90176</v>
+                    <v>90178</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -22546,7 +22564,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>90176</v>
+                                    <v>90178</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22653,11 +22671,11 @@
         </relation>
         <relation>
             <name>concept_template_argument</name>
-            <cardinality>112784</cardinality>
+            <cardinality>112786</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>76196</v>
+                    <v>76197</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -22679,7 +22697,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46351</v>
+                                    <v>46352</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22705,7 +22723,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49948</v>
+                                    <v>49949</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22813,7 +22831,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10554</v>
+                                    <v>10555</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23015,15 +23033,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>599125</cardinality>
+            <cardinality>599081</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>599125</v>
+                    <v>599081</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>281345</v>
+                    <v>281324</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23037,7 +23055,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>599125</v>
+                                    <v>599081</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23053,17 +23071,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232012</v>
+                                    <v>231995</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>34914</v>
+                                    <v>34912</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4676</b>
-                                    <v>14418</v>
+                                    <v>14417</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23073,11 +23091,11 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>1178092</cardinality>
+            <cardinality>1178082</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
-                    <v>415851</v>
+                    <v>415848</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -23085,7 +23103,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>112033</v>
+                    <v>112032</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23099,22 +23117,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82909</v>
+                                    <v>82908</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>126023</v>
+                                    <v>126022</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>107841</v>
+                                    <v>107840</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>49266</v>
+                                    <v>49265</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -23124,7 +23142,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>19</b>
-                                    <v>16658</v>
+                                    <v>16657</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23140,12 +23158,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>88897</v>
+                                    <v>88896</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>138653</v>
+                                    <v>138652</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -23414,12 +23432,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79370</v>
+                                    <v>79369</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>17529</v>
+                                    <v>17528</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -23439,19 +23457,19 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>9837</cardinality>
+            <cardinality>9834</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9837</v>
+                    <v>9834</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>8073</v>
+                    <v>8070</v>
                 </e>
                 <e>
                     <k>class_id</k>
-                    <v>4929</v>
+                    <v>4927</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -23465,7 +23483,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9837</v>
+                                    <v>9834</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23481,7 +23499,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9837</v>
+                                    <v>9834</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23497,7 +23515,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7859</v>
+                                    <v>7856</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23518,7 +23536,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7859</v>
+                                    <v>7856</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23539,7 +23557,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3956</v>
+                                    <v>3954</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23570,7 +23588,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3956</v>
+                                    <v>3954</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23643,11 +23661,11 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>868922</cardinality>
+            <cardinality>868944</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>863725</v>
+                    <v>863749</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -23665,12 +23683,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>858528</v>
+                                    <v>858554</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5196</v>
+                                    <v>5194</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23699,8 +23717,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>530</a>
-                                    <b>531</b>
+                                    <a>533</a>
+                                    <b>534</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -23714,18 +23732,18 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>4192</a>
-                                    <b>4193</b>
+                                    <a>4195</a>
+                                    <b>4196</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>18328</a>
-                                    <b>18329</b>
+                                    <a>18331</a>
+                                    <b>18332</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>55214</a>
-                                    <b>55215</b>
+                                    <a>55237</a>
+                                    <b>55238</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -23736,11 +23754,11 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>9572191</cardinality>
+            <cardinality>9572483</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>3955783</v>
+                    <v>3955752</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -23758,27 +23776,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1511321</v>
+                                    <v>1511309</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>501195</v>
+                                    <v>500822</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1019334</v>
+                                    <v>1019694</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>682052</v>
+                                    <v>682047</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>8</b>
-                                    <v>241880</v>
+                                    <v>241878</v>
                                 </b>
                             </bs>
                         </hist>
@@ -23882,8 +23900,8 @@
                                     <v>122</v>
                                 </b>
                                 <b>
-                                    <a>22794</a>
-                                    <b>22795</b>
+                                    <a>22797</a>
+                                    <b>22798</b>
                                     <v>122</v>
                                 </b>
                             </bs>
@@ -23894,11 +23912,11 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>3148493</cardinality>
+            <cardinality>3148468</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>2429115</v>
+                    <v>2429095</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -23916,17 +23934,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1807839</v>
+                                    <v>1807824</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>523664</v>
+                                    <v>523660</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>97611</v>
+                                    <v>97610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24040,11 +24058,11 @@
         </relation>
         <relation>
             <name>attributes</name>
-            <cardinality>644113</cardinality>
+            <cardinality>644108</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>644113</v>
+                    <v>644108</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -24060,7 +24078,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>638096</v>
+                    <v>638091</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24074,7 +24092,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>644113</v>
+                                    <v>644108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24090,7 +24108,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>644113</v>
+                                    <v>644108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24106,7 +24124,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>644113</v>
+                                    <v>644108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24122,7 +24140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>644113</v>
+                                    <v>644108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24525,7 +24543,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>632326</v>
+                                    <v>632321</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24546,7 +24564,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>638096</v>
+                                    <v>638091</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24562,7 +24580,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>633062</v>
+                                    <v>633057</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24583,7 +24601,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>638096</v>
+                                    <v>638091</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24593,11 +24611,11 @@
         </relation>
         <relation>
             <name>attribute_args</name>
-            <cardinality>82122</cardinality>
+            <cardinality>82121</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>82122</v>
+                    <v>82121</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -24627,7 +24645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82122</v>
+                                    <v>82121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24643,7 +24661,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82122</v>
+                                    <v>82121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24659,7 +24677,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82122</v>
+                                    <v>82121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24675,7 +24693,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>82122</v>
+                                    <v>82121</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24821,7 +24839,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>69371</v>
+                                    <v>69370</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24863,7 +24881,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>68381</v>
+                                    <v>68380</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25053,7 +25071,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>11795</v>
+                                    <v>11794</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25121,7 +25139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>56632</v>
+                                    <v>56631</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25136,11 +25154,11 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>16545</cardinality>
+            <cardinality>16544</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>16545</v>
+                    <v>16544</v>
                 </e>
                 <e>
                     <k>value</k>
@@ -25158,7 +25176,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16545</v>
+                                    <v>16544</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25292,15 +25310,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>72691</cardinality>
+            <cardinality>72665</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>72691</v>
+                    <v>72665</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>72691</v>
+                    <v>72665</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25314,7 +25332,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72691</v>
+                                    <v>72665</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25330,7 +25348,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72691</v>
+                                    <v>72665</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25441,11 +25459,11 @@
         </relation>
         <relation>
             <name>typeattributes</name>
-            <cardinality>94787</cardinality>
+            <cardinality>94786</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>93068</v>
+                    <v>93067</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -25463,7 +25481,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>91349</v>
+                                    <v>91348</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25484,7 +25502,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>27503</v>
+                                    <v>27502</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25504,15 +25522,15 @@
         </relation>
         <relation>
             <name>funcattributes</name>
-            <cardinality>834547</cardinality>
+            <cardinality>834541</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>788873</v>
+                    <v>788866</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>607647</v>
+                    <v>607642</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25526,7 +25544,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>747618</v>
+                                    <v>747612</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25547,7 +25565,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>561358</v>
+                                    <v>561353</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25756,15 +25774,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>7365434</cardinality>
+            <cardinality>7365375</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>7365434</v>
+                    <v>7365375</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>4133203</v>
+                    <v>4133170</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25778,7 +25796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7365434</v>
+                                    <v>7365375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25794,17 +25812,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2667188</v>
+                                    <v>2667167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1105036</v>
+                                    <v>1105027</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>311742</v>
+                                    <v>311740</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -25819,19 +25837,19 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4121662</cardinality>
+            <cardinality>4121629</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>532872</v>
+                    <v>532868</v>
                 </e>
                 <e>
                     <k>index</k>
-                    <v>29222</v>
+                    <v>29221</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4117119</v>
+                    <v>4117086</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25845,7 +25863,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>126710</v>
+                                    <v>126709</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25865,7 +25883,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>41623</v>
+                                    <v>41622</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -25875,7 +25893,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>41623</v>
+                                    <v>41622</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -25911,12 +25929,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>126465</v>
+                                    <v>126464</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80667</v>
+                                    <v>80666</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25926,12 +25944,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>44447</v>
+                                    <v>44446</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>41623</v>
+                                    <v>41622</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -26109,7 +26127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4117119</v>
+                                    <v>4117086</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26125,7 +26143,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4112576</v>
+                                    <v>4112543</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26148,7 +26166,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>70189</v>
+                    <v>70206</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26178,22 +26196,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38046</v>
+                                    <v>38074</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24882</v>
+                                    <v>24873</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>6159</v>
+                                    <v>6156</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>45</b>
-                                    <v>1101</v>
+                                    <v>1100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26203,15 +26221,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>494887</cardinality>
+            <cardinality>494850</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>494887</v>
+                    <v>494850</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>473343</v>
+                    <v>473309</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -26219,11 +26237,11 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>240926</v>
+                    <v>240908</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>35083</v>
+                    <v>35081</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26237,7 +26255,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>494887</v>
+                                    <v>494850</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26253,7 +26271,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>494887</v>
+                                    <v>494850</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26269,7 +26287,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>494887</v>
+                                    <v>494850</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26285,7 +26303,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>494887</v>
+                                    <v>494850</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26301,12 +26319,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>456966</v>
+                                    <v>456933</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>16376</v>
+                                    <v>16375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26322,12 +26340,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>456966</v>
+                                    <v>456933</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>16376</v>
+                                    <v>16375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26343,12 +26361,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>456966</v>
+                                    <v>456933</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>16376</v>
+                                    <v>16375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26364,12 +26382,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>456966</v>
+                                    <v>456933</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>16376</v>
+                                    <v>16375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26524,12 +26542,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>231269</v>
+                                    <v>231252</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1758</b>
-                                    <v>9657</v>
+                                    <v>9656</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26545,12 +26563,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>231269</v>
+                                    <v>231252</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1758</b>
-                                    <v>9657</v>
+                                    <v>9656</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26566,7 +26584,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>240487</v>
+                                    <v>240469</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26587,7 +26605,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>235658</v>
+                                    <v>235641</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26608,7 +26626,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26000</v>
+                                    <v>25998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26644,7 +26662,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26000</v>
+                                    <v>25998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26680,7 +26698,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35083</v>
+                                    <v>35081</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26696,12 +26714,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28330</v>
+                                    <v>28328</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2600</v>
+                                    <v>2599</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -26721,11 +26739,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>496643</cardinality>
+            <cardinality>496606</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>494448</v>
+                    <v>494411</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -26743,7 +26761,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492253</v>
+                                    <v>492217</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26789,11 +26807,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>468211</cardinality>
+            <cardinality>468176</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>468211</v>
+                    <v>468176</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -26811,7 +26829,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>468211</v>
+                                    <v>468176</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26872,11 +26890,11 @@
         </relation>
         <relation>
             <name>virtual_base_offsets</name>
-            <cardinality>5774</cardinality>
+            <cardinality>5773</cardinality>
             <columnsizes>
                 <e>
                     <k>sub</k>
-                    <v>5774</v>
+                    <v>5773</v>
                 </e>
                 <e>
                     <k>super</k>
@@ -26898,7 +26916,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5774</v>
+                                    <v>5773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26914,7 +26932,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5774</v>
+                                    <v>5773</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27008,23 +27026,23 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>765587</cardinality>
+            <cardinality>765911</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>765587</v>
+                    <v>765911</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>54229</v>
+                    <v>54225</v>
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>100489</v>
+                    <v>100482</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6044</v>
+                    <v>6043</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27038,7 +27056,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>765587</v>
+                                    <v>765911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27054,7 +27072,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>765587</v>
+                                    <v>765911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27070,7 +27088,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>765587</v>
+                                    <v>765911</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27091,22 +27109,22 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24953</v>
+                                    <v>24951</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4794</v>
+                                    <v>4760</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>17</b>
-                                    <v>4693</v>
+                                    <v>4727</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>27</b>
-                                    <v>4457</v>
+                                    <v>4456</v>
                                 </b>
                                 <b>
                                     <a>27</a>
@@ -27142,22 +27160,22 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24953</v>
+                                    <v>24951</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>4794</v>
+                                    <v>4760</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>17</b>
-                                    <v>4693</v>
+                                    <v>4727</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>27</b>
-                                    <v>4457</v>
+                                    <v>4456</v>
                                 </b>
                                 <b>
                                     <a>27</a>
@@ -27188,7 +27206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52878</v>
+                                    <v>52875</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27209,32 +27227,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67431</v>
+                                    <v>67359</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7968</v>
+                                    <v>8103</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>9252</v>
+                                    <v>9183</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>24</b>
-                                    <v>7597</v>
+                                    <v>7596</v>
                                 </b>
                                 <b>
                                     <a>24</a>
-                                    <b>135</b>
-                                    <v>7597</v>
+                                    <b>136</b>
+                                    <v>7630</v>
                                 </b>
                                 <b>
-                                    <a>135</a>
+                                    <a>137</a>
                                     <b>191</b>
-                                    <v>641</v>
+                                    <v>607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27250,32 +27268,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67431</v>
+                                    <v>67359</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7968</v>
+                                    <v>8103</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>9252</v>
+                                    <v>9183</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>24</b>
-                                    <v>7597</v>
+                                    <v>7596</v>
                                 </b>
                                 <b>
                                     <a>24</a>
-                                    <b>135</b>
-                                    <v>7597</v>
+                                    <b>136</b>
+                                    <v>7630</v>
                                 </b>
                                 <b>
-                                    <a>135</a>
+                                    <a>137</a>
                                     <b>191</b>
-                                    <v>641</v>
+                                    <v>607</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27291,7 +27309,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99273</v>
+                                    <v>99267</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27316,7 +27334,7 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>22484</b>
+                                    <b>22495</b>
                                     <v>371</v>
                                 </b>
                             </bs>
@@ -27333,7 +27351,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5909</v>
+                                    <v>5908</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27369,19 +27387,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>11058465</cardinality>
+            <cardinality>11058376</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11058465</v>
+                    <v>11058376</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>4237445</v>
+                    <v>4237411</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11058465</v>
+                    <v>11058376</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27395,7 +27413,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11058465</v>
+                                    <v>11058376</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27411,7 +27429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11058465</v>
+                                    <v>11058376</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27427,12 +27445,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3867994</v>
+                                    <v>3867964</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>318495</v>
+                                    <v>318493</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -27453,12 +27471,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3867994</v>
+                                    <v>3867964</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>318495</v>
+                                    <v>318493</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -27479,7 +27497,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11058465</v>
+                                    <v>11058376</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27495,7 +27513,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11058465</v>
+                                    <v>11058376</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27505,15 +27523,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3860014</cardinality>
+            <cardinality>3859983</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3297919</v>
+                    <v>3297892</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3697082</v>
+                    <v>3697053</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27527,7 +27545,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3230266</v>
+                                    <v>3230240</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27548,12 +27566,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3534151</v>
+                                    <v>3534122</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>162931</v>
+                                    <v>162930</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27563,15 +27581,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>9630323</cardinality>
+            <cardinality>9630246</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9630218</v>
+                    <v>9630141</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>9630323</v>
+                    <v>9630246</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27585,7 +27603,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9630112</v>
+                                    <v>9630035</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27606,7 +27624,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9630323</v>
+                                    <v>9630246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27616,22 +27634,22 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>9856495</cardinality>
+            <cardinality>9855321</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9856495</v>
+                    <v>9855321</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1663253</cardinality>
+            <cardinality>1663283</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>1238704</v>
+                    <v>1238727</v>
                 </e>
                 <e>
                     <k>i</k>
@@ -27639,7 +27657,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1663253</v>
+                    <v>1663283</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27653,12 +27671,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>824561</v>
+                                    <v>824576</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>407377</v>
+                                    <v>407385</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27679,12 +27697,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>824561</v>
+                                    <v>824576</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>407377</v>
+                                    <v>407385</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27837,7 +27855,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1663253</v>
+                                    <v>1663283</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27853,7 +27871,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1663253</v>
+                                    <v>1663283</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27863,15 +27881,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>8757</cardinality>
+            <cardinality>8754</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8757</v>
+                    <v>8754</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>4630</v>
+                    <v>4628</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27885,7 +27903,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8757</v>
+                                    <v>8754</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27901,7 +27919,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3785</v>
+                                    <v>3783</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27911,7 +27929,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>149</b>
-                                    <v>310</v>
+                                    <v>309</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27932,15 +27950,15 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2457354</cardinality>
+            <cardinality>2457335</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
-                    <v>3929</v>
+                    <v>3928</v>
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2457354</v>
+                    <v>2457335</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28030,7 +28048,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2457354</v>
+                                    <v>2457335</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28040,11 +28058,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19448700</cardinality>
+            <cardinality>19448545</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19448700</v>
+                    <v>19448545</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -28052,7 +28070,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12936328</v>
+                    <v>12936225</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28066,7 +28084,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19448700</v>
+                                    <v>19448545</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28082,7 +28100,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19448700</v>
+                                    <v>19448545</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28200,17 +28218,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7392678</v>
+                                    <v>7392619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5081231</v>
+                                    <v>5081191</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>462418</v>
+                                    <v>462414</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28226,17 +28244,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7392678</v>
+                                    <v>7392619</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5081231</v>
+                                    <v>5081191</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>462418</v>
+                                    <v>462414</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28246,22 +28264,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6890637</cardinality>
+            <cardinality>6890582</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6890637</v>
+                    <v>6890582</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>6047233</cardinality>
+            <cardinality>6047238</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6047233</v>
+                    <v>6047238</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -28279,7 +28297,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6047233</v>
+                                    <v>6047238</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28323,8 +28341,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5828722</a>
-                                    <b>5828723</b>
+                                    <a>5828727</a>
+                                    <b>5828728</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -28335,11 +28353,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>5777667</cardinality>
+            <cardinality>5777774</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>5777667</v>
+                    <v>5777774</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -28357,7 +28375,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5777667</v>
+                                    <v>5777774</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28393,11 +28411,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>684876</cardinality>
+            <cardinality>684871</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>684876</v>
+                    <v>684871</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -28415,7 +28433,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>684876</v>
+                                    <v>684871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28524,23 +28542,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>3044887</cardinality>
+            <cardinality>3044942</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3044887</v>
+                    <v>3044942</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>3044887</v>
+                    <v>3044942</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>54379</v>
+                    <v>54380</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>557008</v>
+                    <v>557018</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28554,7 +28572,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3044887</v>
+                                    <v>3044942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28570,7 +28588,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3044887</v>
+                                    <v>3044942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28586,7 +28604,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3044887</v>
+                                    <v>3044942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28602,7 +28620,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3044887</v>
+                                    <v>3044942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28618,7 +28636,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3044887</v>
+                                    <v>3044942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28634,7 +28652,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3044887</v>
+                                    <v>3044942</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28712,7 +28730,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41234</v>
+                                    <v>41235</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28743,22 +28761,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84417</v>
+                                    <v>84418</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>39007</v>
+                                    <v>39008</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>397208</v>
+                                    <v>397215</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36374</v>
+                                    <v>36375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28774,22 +28792,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84417</v>
+                                    <v>84418</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>39007</v>
+                                    <v>39008</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>397208</v>
+                                    <v>397215</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36374</v>
+                                    <v>36375</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28805,17 +28823,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>117045</v>
+                                    <v>117047</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>14065</v>
+                                    <v>14066</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>413479</v>
+                                    <v>413487</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -28830,15 +28848,15 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>8252279</cardinality>
+            <cardinality>8252213</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>8252279</v>
+                    <v>8252213</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>1050076</v>
+                    <v>1050068</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28852,7 +28870,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8252279</v>
+                                    <v>8252213</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28868,27 +28886,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171487</v>
+                                    <v>171485</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>188646</v>
+                                    <v>188645</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>145606</v>
+                                    <v>145605</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>116603</v>
+                                    <v>116602</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>83127</v>
+                                    <v>83126</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -28898,7 +28916,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>80792</v>
+                                    <v>80791</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -28908,12 +28926,12 @@
                                 <b>
                                     <a>13</a>
                                     <b>27</b>
-                                    <v>79104</v>
+                                    <v>79103</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>5137</b>
-                                    <v>37358</v>
+                                    <v>37357</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28923,15 +28941,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>5788265</cardinality>
+            <cardinality>5788371</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>5785803</v>
+                    <v>5785909</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>275046</v>
+                    <v>275051</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28945,7 +28963,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5783341</v>
+                                    <v>5783447</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28966,7 +28984,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>180845</v>
+                                    <v>180848</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28996,11 +29014,11 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>44842</cardinality>
+            <cardinality>44839</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>44842</v>
+                    <v>44839</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -29022,7 +29040,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44842</v>
+                                    <v>44839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29038,7 +29056,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44842</v>
+                                    <v>44839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29122,11 +29140,11 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>53351</cardinality>
+            <cardinality>53347</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>53351</v>
+                    <v>53347</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -29148,7 +29166,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53351</v>
+                                    <v>53347</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29164,7 +29182,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53351</v>
+                                    <v>53347</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29269,15 +29287,15 @@
         </relation>
         <relation>
             <name>expr_cond_guard</name>
-            <cardinality>897622</cardinality>
+            <cardinality>897615</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>897622</v>
+                    <v>897615</v>
                 </e>
                 <e>
                     <k>guard</k>
-                    <v>897622</v>
+                    <v>897615</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29291,7 +29309,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897622</v>
+                                    <v>897615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29307,7 +29325,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897622</v>
+                                    <v>897615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29317,15 +29335,15 @@
         </relation>
         <relation>
             <name>expr_cond_true</name>
-            <cardinality>897618</cardinality>
+            <cardinality>897611</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>897618</v>
+                    <v>897611</v>
                 </e>
                 <e>
                     <k>true</k>
-                    <v>897618</v>
+                    <v>897611</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29339,7 +29357,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897618</v>
+                                    <v>897611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29355,7 +29373,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897618</v>
+                                    <v>897611</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29365,15 +29383,15 @@
         </relation>
         <relation>
             <name>expr_cond_false</name>
-            <cardinality>897622</cardinality>
+            <cardinality>897615</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>897622</v>
+                    <v>897615</v>
                 </e>
                 <e>
                     <k>false</k>
-                    <v>897622</v>
+                    <v>897615</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29387,7 +29405,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897622</v>
+                                    <v>897615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29403,7 +29421,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897622</v>
+                                    <v>897615</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29413,15 +29431,15 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>13539325</cardinality>
+            <cardinality>13539217</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13539325</v>
+                    <v>13539217</v>
                 </e>
                 <e>
                     <k>str</k>
-                    <v>113961</v>
+                    <v>113960</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29435,7 +29453,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13539325</v>
+                                    <v>13539217</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29481,11 +29499,11 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>6632066</cardinality>
+            <cardinality>6631932</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6632066</v>
+                    <v>6631932</v>
                 </e>
                 <e>
                     <k>text</k>
@@ -29503,7 +29521,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6632066</v>
+                                    <v>6631932</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29533,7 +29551,7 @@
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>594514</b>
+                                    <b>594510</b>
                                     <v>27811</v>
                                 </b>
                             </bs>
@@ -29544,15 +29562,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>13647524</cardinality>
+            <cardinality>13647415</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>13539325</v>
+                    <v>13539217</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>13647524</v>
+                    <v>13647415</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29566,12 +29584,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13449127</v>
+                                    <v>13449020</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>90198</v>
+                                    <v>90197</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29587,7 +29605,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13647524</v>
+                                    <v>13647415</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29597,11 +29615,11 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1502215</cardinality>
+            <cardinality>1502203</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1502215</v>
+                    <v>1502203</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
@@ -29623,7 +29641,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1502215</v>
+                                    <v>1502203</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29639,7 +29657,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1502215</v>
+                                    <v>1502203</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29989,23 +30007,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>2292690</cardinality>
+            <cardinality>2292672</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>2292690</v>
+                    <v>2292672</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>998340</v>
+                    <v>998332</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>2292690</v>
+                    <v>2292672</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>526645</v>
+                    <v>526641</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30019,7 +30037,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2292690</v>
+                                    <v>2292672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30035,7 +30053,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2292690</v>
+                                    <v>2292672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30051,7 +30069,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2292690</v>
+                                    <v>2292672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30067,17 +30085,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>874360</v>
+                                    <v>874353</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>51218</v>
+                                    <v>51217</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>72761</v>
+                                    <v>72760</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30093,17 +30111,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>874360</v>
+                                    <v>874353</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>15</b>
-                                    <v>51218</v>
+                                    <v>51217</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>25</b>
-                                    <v>72761</v>
+                                    <v>72760</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30119,7 +30137,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>998332</v>
+                                    <v>998324</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30140,7 +30158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2292690</v>
+                                    <v>2292672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30156,7 +30174,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2292690</v>
+                                    <v>2292672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30172,7 +30190,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2292690</v>
+                                    <v>2292672</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30188,7 +30206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>415900</v>
+                                    <v>415896</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30219,7 +30237,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>454329</v>
+                                    <v>454326</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30245,7 +30263,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>415900</v>
+                                    <v>415896</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30270,26 +30288,26 @@
         </relation>
         <relation>
             <name>braced_initialisers</name>
-            <cardinality>67888</cardinality>
+            <cardinality>67930</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>67888</v>
+                    <v>67930</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>1669204</cardinality>
+            <cardinality>1669235</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>1669204</v>
+                    <v>1669235</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>835480</v>
+                    <v>835495</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30303,7 +30321,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1669204</v>
+                                    <v>1669235</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30324,7 +30342,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>808504</v>
+                                    <v>808519</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -30339,11 +30357,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25203419</cardinality>
+            <cardinality>25203218</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25203419</v>
+                    <v>25203218</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -30351,7 +30369,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>10582678</v>
+                    <v>10582593</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30365,7 +30383,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25203419</v>
+                                    <v>25203218</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30381,7 +30399,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25203419</v>
+                                    <v>25203218</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30559,22 +30577,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8901168</v>
+                                    <v>8901097</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>820384</v>
+                                    <v>820377</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>16</b>
-                                    <v>796981</v>
+                                    <v>796974</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>71733</b>
-                                    <v>64144</v>
+                                    <v>64143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30590,17 +30608,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9040532</v>
+                                    <v>9040460</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>774061</v>
+                                    <v>774055</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>32</b>
-                                    <v>768084</v>
+                                    <v>768078</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30610,15 +30628,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>842823</cardinality>
+            <cardinality>842839</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>842823</v>
+                    <v>842839</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>842823</v>
+                    <v>842839</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -30636,7 +30654,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>842823</v>
+                                    <v>842839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30652,7 +30670,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>842823</v>
+                                    <v>842839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30668,7 +30686,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>842823</v>
+                                    <v>842839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30684,7 +30702,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>842823</v>
+                                    <v>842839</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30736,15 +30754,15 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25203419</cardinality>
+            <cardinality>25203218</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25203419</v>
+                    <v>25203218</v>
                 </e>
                 <e>
                     <k>typeid</k>
-                    <v>214144</v>
+                    <v>214142</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -30762,7 +30780,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25203419</v>
+                                    <v>25203218</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30778,7 +30796,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25203419</v>
+                                    <v>25203218</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30819,7 +30837,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>17382</v>
+                                    <v>17381</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -30855,7 +30873,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>185862</v>
+                                    <v>185861</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -30923,15 +30941,15 @@
         </relation>
         <relation>
             <name>new_allocated_type</name>
-            <cardinality>45787</cardinality>
+            <cardinality>45784</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>45787</v>
+                    <v>45784</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>27148</v>
+                    <v>27146</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -30945,7 +30963,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45787</v>
+                                    <v>45784</v>
                                 </b>
                             </bs>
                         </hist>
@@ -30961,12 +30979,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11413</v>
+                                    <v>11412</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14350</v>
+                                    <v>14349</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -31044,11 +31062,11 @@
         </relation>
         <relation>
             <name>param_ref_to_this</name>
-            <cardinality>25267</cardinality>
+            <cardinality>25272</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>25267</v>
+                    <v>25272</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -32391,15 +32409,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>406885</cardinality>
+            <cardinality>406893</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>406885</v>
+                    <v>406893</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>406885</v>
+                    <v>406893</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32413,7 +32431,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406885</v>
+                                    <v>406893</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32429,7 +32447,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>406885</v>
+                                    <v>406893</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32439,15 +32457,15 @@
         </relation>
         <relation>
             <name>typeid_bind</name>
-            <cardinality>47476</cardinality>
+            <cardinality>47472</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>47476</v>
+                    <v>47472</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>15802</v>
+                    <v>15801</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -32461,7 +32479,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47476</v>
+                                    <v>47472</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32545,11 +32563,11 @@
         </relation>
         <relation>
             <name>sizeof_bind</name>
-            <cardinality>241939</cardinality>
+            <cardinality>241937</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>241939</v>
+                    <v>241937</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -32567,7 +32585,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>241939</v>
+                                    <v>241937</v>
                                 </b>
                             </bs>
                         </hist>
@@ -32930,7 +32948,7 @@
                 </e>
                 <e>
                     <k>lambda</k>
-                    <v>15469</v>
+                    <v>15468</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -34010,7 +34028,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15712</v>
+                                    <v>15711</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34036,7 +34054,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16287</v>
+                                    <v>16286</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34083,7 +34101,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15712</v>
+                                    <v>15711</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34109,7 +34127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17915</v>
+                                    <v>17914</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34266,11 +34284,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>6328636</cardinality>
+            <cardinality>6328585</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6328636</v>
+                    <v>6328585</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -34278,7 +34296,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2676389</v>
+                    <v>2676368</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34292,7 +34310,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6328636</v>
+                                    <v>6328585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34308,7 +34326,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6328636</v>
+                                    <v>6328585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34546,22 +34564,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2225153</v>
+                                    <v>2225135</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>177732</v>
+                                    <v>177731</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>203471</v>
+                                    <v>203469</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>1816</b>
-                                    <v>70032</v>
+                                    <v>70031</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34577,7 +34595,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2599926</v>
+                                    <v>2599906</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34747,15 +34765,15 @@
         </relation>
         <relation>
             <name>if_then</name>
-            <cardinality>989932</cardinality>
+            <cardinality>989924</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>989932</v>
+                    <v>989924</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>989932</v>
+                    <v>989924</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34769,7 +34787,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>989932</v>
+                                    <v>989924</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34785,7 +34803,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>989932</v>
+                                    <v>989924</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34795,15 +34813,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>434910</cardinality>
+            <cardinality>434918</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>434910</v>
+                    <v>434918</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>434910</v>
+                    <v>434918</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34817,7 +34835,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>434910</v>
+                                    <v>434918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34833,7 +34851,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>434910</v>
+                                    <v>434918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34891,15 +34909,15 @@
         </relation>
         <relation>
             <name>constexpr_if_then</name>
-            <cardinality>103259</cardinality>
+            <cardinality>103258</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>103259</v>
+                    <v>103258</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>103259</v>
+                    <v>103258</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34913,7 +34931,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>103259</v>
+                                    <v>103258</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34929,7 +34947,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>103259</v>
+                                    <v>103258</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34939,15 +34957,15 @@
         </relation>
         <relation>
             <name>constexpr_if_else</name>
-            <cardinality>74037</cardinality>
+            <cardinality>74036</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>74037</v>
+                    <v>74036</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>74037</v>
+                    <v>74036</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34961,7 +34979,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>74037</v>
+                                    <v>74036</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34977,7 +34995,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>74037</v>
+                                    <v>74036</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35131,15 +35149,15 @@
         </relation>
         <relation>
             <name>do_body</name>
-            <cardinality>232395</cardinality>
+            <cardinality>232393</cardinality>
             <columnsizes>
                 <e>
                     <k>do_stmt</k>
-                    <v>232395</v>
+                    <v>232393</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>232395</v>
+                    <v>232393</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35153,7 +35171,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232395</v>
+                                    <v>232393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35169,7 +35187,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232395</v>
+                                    <v>232393</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35227,11 +35245,11 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>831947</cardinality>
+            <cardinality>831962</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>409797</v>
+                    <v>409804</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -35239,7 +35257,7 @@
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>831947</v>
+                    <v>831962</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35258,7 +35276,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406928</v>
+                                    <v>406935</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -35284,7 +35302,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>406928</v>
+                                    <v>406935</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -35447,7 +35465,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>831947</v>
+                                    <v>831962</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35463,7 +35481,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>831947</v>
+                                    <v>831962</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35473,15 +35491,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>409797</cardinality>
+            <cardinality>409804</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>409797</v>
+                    <v>409804</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>409797</v>
+                    <v>409804</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35495,7 +35513,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409797</v>
+                                    <v>409804</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35511,7 +35529,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>409797</v>
+                                    <v>409804</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35521,15 +35539,15 @@
         </relation>
         <relation>
             <name>for_initialization</name>
-            <cardinality>73225</cardinality>
+            <cardinality>73224</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>73225</v>
+                    <v>73224</v>
                 </e>
                 <e>
                     <k>init_id</k>
-                    <v>73225</v>
+                    <v>73224</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35543,7 +35561,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73225</v>
+                                    <v>73224</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35559,7 +35577,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>73225</v>
+                                    <v>73224</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35665,15 +35683,15 @@
         </relation>
         <relation>
             <name>for_body</name>
-            <cardinality>84365</cardinality>
+            <cardinality>84364</cardinality>
             <columnsizes>
                 <e>
                     <k>for_stmt</k>
-                    <v>84365</v>
+                    <v>84364</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>84365</v>
+                    <v>84364</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35687,7 +35705,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84365</v>
+                                    <v>84364</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35703,7 +35721,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84365</v>
+                                    <v>84364</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35713,11 +35731,11 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>5605702</cardinality>
+            <cardinality>5605658</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5605702</v>
+                    <v>5605658</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -35725,7 +35743,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2362374</v>
+                    <v>2362355</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35739,7 +35757,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5605702</v>
+                                    <v>5605658</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35755,7 +35773,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5605702</v>
+                                    <v>5605658</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35893,27 +35911,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1342037</v>
+                                    <v>1342027</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>516011</v>
+                                    <v>516007</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>151119</v>
+                                    <v>151118</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>155274</v>
+                                    <v>155272</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>179012</v>
+                                    <v>179010</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -35934,27 +35952,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1342037</v>
+                                    <v>1342027</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>516011</v>
+                                    <v>516007</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>151119</v>
+                                    <v>151118</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>155274</v>
+                                    <v>155272</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>16</b>
-                                    <v>179012</v>
+                                    <v>179010</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -35969,22 +35987,22 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>43492</cardinality>
+            <cardinality>43502</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>43492</v>
+                    <v>43502</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>728504</cardinality>
+            <cardinality>728652</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>688131</v>
+                    <v>688271</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -35992,7 +36010,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>728435</v>
+                    <v>728583</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36006,12 +36024,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>665975</v>
+                                    <v>666111</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>32</b>
-                                    <v>22156</v>
+                                    <v>22160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36027,12 +36045,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>665975</v>
+                                    <v>666111</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>32</b>
-                                    <v>22156</v>
+                                    <v>22160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36170,7 +36188,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>728411</v>
+                                    <v>728559</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36191,7 +36209,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>728435</v>
+                                    <v>728583</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36201,11 +36219,11 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>728504</cardinality>
+            <cardinality>728652</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>688131</v>
+                    <v>688271</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -36213,7 +36231,7 @@
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>728504</v>
+                    <v>728652</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36227,12 +36245,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>665975</v>
+                                    <v>666111</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>32</b>
-                                    <v>22156</v>
+                                    <v>22160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36248,12 +36266,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>665975</v>
+                                    <v>666111</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>32</b>
-                                    <v>22156</v>
+                                    <v>22160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36391,7 +36409,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>728504</v>
+                                    <v>728652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36407,7 +36425,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>728504</v>
+                                    <v>728652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36417,15 +36435,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1625753</cardinality>
+            <cardinality>1625740</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1625753</v>
+                    <v>1625740</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1404746</v>
+                    <v>1404735</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36439,7 +36457,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1625753</v>
+                                    <v>1625740</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36455,12 +36473,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1267599</v>
+                                    <v>1267589</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>122045</v>
+                                    <v>122044</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -36475,11 +36493,11 @@
         </relation>
         <relation>
             <name>jumpinfo</name>
-            <cardinality>348076</cardinality>
+            <cardinality>348073</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>348076</v>
+                    <v>348073</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -36487,7 +36505,7 @@
                 </e>
                 <e>
                     <k>target</k>
-                    <v>72655</v>
+                    <v>72654</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36501,7 +36519,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348076</v>
+                                    <v>348073</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36517,7 +36535,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348076</v>
+                                    <v>348073</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36558,7 +36576,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>25</b>
-                                    <v>2188</v>
+                                    <v>2187</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -36646,7 +36664,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72655</v>
+                                    <v>72654</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36656,11 +36674,11 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5322959</cardinality>
+            <cardinality>5322916</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5322959</v>
+                    <v>5322916</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -36668,7 +36686,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5319889</v>
+                    <v>5319847</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36682,7 +36700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5322959</v>
+                                    <v>5322916</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36698,7 +36716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5322959</v>
+                                    <v>5322916</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36846,7 +36864,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5319766</v>
+                                    <v>5319724</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -36867,7 +36885,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5319889</v>
+                                    <v>5319847</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36877,15 +36895,15 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1123207</cardinality>
+            <cardinality>1123198</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
-                    <v>874943</v>
+                    <v>874936</v>
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1123207</v>
+                    <v>1123198</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36899,12 +36917,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>639324</v>
+                                    <v>639319</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>226777</v>
+                                    <v>226776</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -36925,7 +36943,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1123207</v>
+                                    <v>1123198</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36935,41 +36953,41 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>432314</cardinality>
+            <cardinality>432311</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>432314</v>
+                    <v>432311</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preprocfalse</name>
-            <cardinality>280801</cardinality>
+            <cardinality>280799</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>280801</v>
+                    <v>280799</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>4283611</cardinality>
+            <cardinality>4283577</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4283611</v>
+                    <v>4283577</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2908455</v>
+                    <v>2908431</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1656817</v>
+                    <v>1656804</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -36983,7 +37001,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4283611</v>
+                                    <v>4283577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36999,7 +37017,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4283611</v>
+                                    <v>4283577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37015,12 +37033,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2712986</v>
+                                    <v>2712964</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>798</b>
-                                    <v>195468</v>
+                                    <v>195467</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37036,7 +37054,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2828524</v>
+                                    <v>2828501</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -37057,12 +37075,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1510952</v>
+                                    <v>1510940</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>125237</v>
+                                    <v>125236</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -37083,17 +37101,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1515127</v>
+                                    <v>1515115</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>12</b>
-                                    <v>124869</v>
+                                    <v>124868</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>3246</b>
-                                    <v>16821</v>
+                                    <v>16820</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37103,15 +37121,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>322579</cardinality>
+            <cardinality>322460</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>322579</v>
+                    <v>322460</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>59421</v>
+                    <v>59399</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -37125,7 +37143,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>322579</v>
+                                    <v>322460</v>
                                 </b>
                             </bs>
                         </hist>
@@ -37141,32 +37159,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29406</v>
+                                    <v>29395</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9559</v>
+                                    <v>9556</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5015</v>
+                                    <v>5013</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>5421</v>
+                                    <v>5419</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>4576</v>
+                                    <v>4574</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>47</b>
-                                    <v>4459</v>
+                                    <v>4457</v>
                                 </b>
                                 <b>
                                     <a>47</a>
@@ -37277,11 +37295,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>31164351</cardinality>
+            <cardinality>31162056</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3960481</v>
+                    <v>3960190</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -37299,17 +37317,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>540607</v>
+                                    <v>540567</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>27182</v>
+                                    <v>27180</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3392691</v>
+                                    <v>3392442</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/old.dbscheme b/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/old.dbscheme
new file mode 100644
index 000000000000..6aec212e408f
--- /dev/null
+++ b/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/old.dbscheme
@@ -0,0 +1,2588 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float            // C99-specific _Complex float
+| 28 = @complex_double           // C99-specific _Complex double
+| 29 = @complex_long_double      // C99-specific _Complex long double
+| 30 = @imaginary_float          // C99-specific _Imaginary float
+| 31 = @imaginary_double         // C99-specific _Imaginary double
+| 32 = @imaginary_long_double    // C99-specific _Imaginary long double
+| 33 = @wchar_t                  // Microsoft-specific
+| 34 = @decltype_nullptr         // C++11
+| 35 = @int128                   // __int128
+| 36 = @unsigned_int128          // unsigned __int128
+| 37 = @signed_int128            // signed __int128
+| 38 = @float128                 // __float128
+| 39 = @complex_float128         // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32              // _Float32
+| 46 = @float32x                 // _Float32x
+| 47 = @std_float64              // _Float64
+| 48 = @float64x                 // _Float64x
+| 49 = @std_float128             // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16                  // _Float16
+| 53 = @complex_float16          // _Complex _Float16
+| 54 = @fp16                     // __fp16
+| 55 = @std_bfloat16             // __bf16
+| 56 = @std_float16              // std::float16_t
+| 57 = @complex_std_float32      // _Complex _Float32
+| 58 = @complex_float32x         // _Complex _Float32x
+| 59 = @complex_std_float64      // _Complex _Float64
+| 60 = @complex_float64x         // _Complex _Float64x
+| 61 = @complex_std_float128     // _Complex _Float128
+| 62 = @mfp8                     // __mfp8
+| 63 = @scalable_vector_count    // __SVCount_t
+| 64 = @complex_fp16             // _Complex __fp16
+| 65 = @complex_std_bfloat16     // _Complex __bf16
+| 66 = @complex_std_float16      // _Complex std::float16_t
+| 67 = @bit_precise_int          // _BitInt(N)
+| 68 = @unsigned_bit_precise_int // unsigned _BitInt(N)
+| 69 = @signed_bit_precise_int   // signed _BitInt(N)
+;
+
+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
+);
+
+bit_precise_int_types(
+    unique int id: @builtintype ref,
+    int bit_width: int ref
+)
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(
+    unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..293904928d85
--- /dev/null
+++ b/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/semmlecode.cpp.dbscheme
@@ -0,0 +1,2602 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+/**
+ * Gives the TRAP filename that `trap` is associated with.
+ * For debugging only.
+ */
+trap_filename(
+    int trap: @trap,
+    string filename: string ref
+);
+
+/**
+ * Gives the tag name for `tag`.
+ * For debugging only.
+ */
+tag_name(
+    int tag: @tag,
+    string name: string ref
+);
+
+@trap_or_tag = @tag | @trap;
+
+/**
+ * Gives the name for the source file.
+ */
+source_file_name(
+    int sf: @source_file,
+    string name: string ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that `source_file`
+ * (`/path/to/foo.c`) uses the TRAP file `trap_file`; i.e. it is the
+ * TRAP file corresponding to `foo.c`, something it transitively
+ * includes, or a template instantiation it transitively uses.
+ */
+source_file_uses_trap(
+    int source_file: @source_file ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * In `build-mode: none` overlay mode, indicates that the TRAP file
+ * `trap_file` uses tag `tag`.
+ */
+trap_uses_tag(
+    int trap_file: @trap ref,
+    int tag: @tag ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file or tag `t`.
+ */
+in_trap_or_tag(
+    int element: @element ref,
+    int t: @trap_or_tag ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float            // C99-specific _Complex float
+| 28 = @complex_double           // C99-specific _Complex double
+| 29 = @complex_long_double      // C99-specific _Complex long double
+| 30 = @imaginary_float          // C99-specific _Imaginary float
+| 31 = @imaginary_double         // C99-specific _Imaginary double
+| 32 = @imaginary_long_double    // C99-specific _Imaginary long double
+| 33 = @wchar_t                  // Microsoft-specific
+| 34 = @decltype_nullptr         // C++11
+| 35 = @int128                   // __int128
+| 36 = @unsigned_int128          // unsigned __int128
+| 37 = @signed_int128            // signed __int128
+| 38 = @float128                 // __float128
+| 39 = @complex_float128         // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32              // _Float32
+| 46 = @float32x                 // _Float32x
+| 47 = @std_float64              // _Float64
+| 48 = @float64x                 // _Float64x
+| 49 = @std_float128             // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16                  // _Float16
+| 53 = @complex_float16          // _Complex _Float16
+| 54 = @fp16                     // __fp16
+| 55 = @std_bfloat16             // __bf16
+| 56 = @std_float16              // std::float16_t
+| 57 = @complex_std_float32      // _Complex _Float32
+| 58 = @complex_float32x         // _Complex _Float32x
+| 59 = @complex_std_float64      // _Complex _Float64
+| 60 = @complex_float64x         // _Complex _Float64x
+| 61 = @complex_std_float128     // _Complex _Float128
+| 62 = @mfp8                     // __mfp8
+| 63 = @scalable_vector_count    // __SVCount_t
+| 64 = @complex_fp16             // _Complex __fp16
+| 65 = @complex_std_bfloat16     // _Complex __bf16
+| 66 = @complex_std_float16      // _Complex std::float16_t
+| 67 = @bit_precise_int          // _BitInt(N)
+| 68 = @unsigned_bit_precise_int // unsigned _BitInt(N)
+| 69 = @signed_bit_precise_int   // signed _BitInt(N)
+;
+
+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
+);
+
+bit_precise_int_types(
+    unique int id: @builtintype ref,
+    int bit_width: int ref
+)
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(
+    unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+class_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+)
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+function_template_generated_from(
+    unique int template: @function ref,
+    int from: @function ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+variable_template_generated_from(
+    unique int template: @variable ref,
+    int from: @variable ref
+);
+
+is_alias_template(unique int id: @usertype ref);
+alias_instantiation(
+    unique int to: @usertype ref,
+    int from: @usertype ref
+);
+alias_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+alias_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+alias_template_generated_from(
+    unique int template: @usertype ref,
+    int from: @usertype ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype
+                       | @derivedtype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+| 397 = @isvirtualbaseof
+| 398 = @isimplicitlifetime
+| 399 = @ltsynthesizesfromspaceship
+| 400 = @gtsynthesizesfromspaceship
+| 401 = @lesynthesizesfromspaceship
+| 402 = @gesynthesizesfromspaceship
+| 403 = @isstructural
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            | @isvirtualbaseof
+            | @isimplicitlifetime
+            | @ltsynthesizesfromspaceship
+            | @gtsynthesizesfromspaceship
+            | @lesynthesizesfromspaceship
+            | @gesynthesizesfromspaceship
+            | @isstructural
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/upgrade.properties b/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/upgrade.properties
new file mode 100644
index 000000000000..db0e7e92d0e9
--- /dev/null
+++ b/cpp/ql/lib/upgrades/6aec212e408fad907b19368a3376a4d9837783d2/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add new builtin operations
+compatibility: backwards
diff --git a/cpp/ql/test/library-tests/builtins/builtins/builtins.expected b/cpp/ql/test/library-tests/builtins/builtins/builtins.expected
index 48007d6b0e18..2e8e7fd247d6 100644
--- a/cpp/ql/test/library-tests/builtins/builtins/builtins.expected
+++ b/cpp/ql/test/library-tests/builtins/builtins/builtins.expected
@@ -1,4 +1,12 @@
 | choose_expr.c:3:13:3:42 | __builtin_choose_expr |
+| spaceship.cpp:22:41:22:101 | __builtin_lt_synthesizes_from_spaceship |
+| spaceship.cpp:23:41:23:89 | __builtin_lt_synthesizes_from_spaceship |
+| spaceship.cpp:24:41:24:101 | __builtin_gt_synthesizes_from_spaceship |
+| spaceship.cpp:25:41:25:89 | __builtin_gt_synthesizes_from_spaceship |
+| spaceship.cpp:26:41:26:101 | __builtin_le_synthesizes_from_spaceship |
+| spaceship.cpp:27:41:27:89 | __builtin_le_synthesizes_from_spaceship |
+| spaceship.cpp:28:41:28:101 | __builtin_ge_synthesizes_from_spaceship |
+| spaceship.cpp:29:41:29:89 | __builtin_ge_synthesizes_from_spaceship |
 | types.c:4:9:4:57 | __builtin_types_compatible_p |
 | types.c:6:16:6:65 | __builtin_types_compatible_p |
 | varargs.c:7:5:7:32 | __builtin_va_start |
diff --git a/cpp/ql/test/library-tests/builtins/builtins/expr.expected b/cpp/ql/test/library-tests/builtins/builtins/expr.expected
new file mode 100644
index 000000000000..a642c211d5c5
--- /dev/null
+++ b/cpp/ql/test/library-tests/builtins/builtins/expr.expected
@@ -0,0 +1,106 @@
+| atomic.cpp:3:10:3:27 | call to __atomic_fetch_add_4 | ptr,1,0 | <none> |
+| atomic.cpp:3:10:3:38 | (int)... |  | <none> |
+| atomic.cpp:3:29:3:31 | (volatile void *)... |  | <none> |
+| atomic.cpp:3:29:3:31 | ptr |  | <none> |
+| atomic.cpp:3:34:3:34 | 1 |  | 1 |
+| atomic.cpp:3:34:3:34 | (unsigned int)... |  | 1 |
+| atomic.cpp:3:37:3:37 | 0 |  | 0 |
+| atomic.cpp:8:10:8:27 | call to __atomic_fetch_add_1 | ptr,1,0 | <none> |
+| atomic.cpp:8:10:8:38 | (char)... |  | <none> |
+| atomic.cpp:8:10:8:38 | (double)... |  | <none> |
+| atomic.cpp:8:29:8:31 | (volatile void *)... |  | <none> |
+| atomic.cpp:8:29:8:31 | ptr |  | <none> |
+| atomic.cpp:8:34:8:34 | 1 |  | 1 |
+| atomic.cpp:8:34:8:34 | (unsigned char)... |  | 1 |
+| atomic.cpp:8:37:8:37 | 0 |  | 0 |
+| atomic.cpp:13:10:13:29 | call to __atomic_fetch_add_4 | ptr,1,0 | <none> |
+| atomic.cpp:13:10:13:40 | (int)... |  | <none> |
+| atomic.cpp:13:31:13:33 | (volatile void *)... |  | <none> |
+| atomic.cpp:13:31:13:33 | ptr |  | <none> |
+| atomic.cpp:13:36:13:36 | 1 |  | 1 |
+| atomic.cpp:13:36:13:36 | (unsigned int)... |  | 1 |
+| atomic.cpp:13:39:13:39 | 0 |  | 0 |
+| atomic.cpp:18:10:18:29 | call to __atomic_fetch_add_1 | ptr,1,0 | <none> |
+| atomic.cpp:18:10:18:40 | (char)... |  | <none> |
+| atomic.cpp:18:31:18:33 | (volatile void *)... |  | <none> |
+| atomic.cpp:18:31:18:33 | ptr |  | <none> |
+| atomic.cpp:18:36:18:36 | 1 |  | 1 |
+| atomic.cpp:18:36:18:36 | (unsigned char)... |  | 1 |
+| atomic.cpp:18:39:18:39 | 0 |  | 0 |
+| choose_expr.c:3:13:3:42 | __builtin_choose_expr | 1,5,6 | <none> |
+| choose_expr.c:3:35:3:35 | 1 |  | 1 |
+| choose_expr.c:3:38:3:38 | 5 |  | 5 |
+| choose_expr.c:3:41:3:41 | 6 |  | 6 |
+| spaceship.cpp:6:45:6:45 | n | this | <none> |
+| spaceship.cpp:6:45:6:45 | this |  | <none> |
+| spaceship.cpp:9:53:9:56 | {...} | - ... | <none> |
+| spaceship.cpp:9:54:9:55 | - ... | 1 | -1 |
+| spaceship.cpp:9:55:9:55 | 1 |  | 1 |
+| spaceship.cpp:10:54:10:56 | {...} | 0 | <none> |
+| spaceship.cpp:10:55:10:55 | 0 |  | 0 |
+| spaceship.cpp:11:56:11:58 | {...} | 1 | <none> |
+| spaceship.cpp:11:57:11:57 | 1 |  | 1 |
+| spaceship.cpp:18:12:18:14 | rhs |  | <none> |
+| spaceship.cpp:18:12:18:24 | ... <=> ... | rhs,i | <none> |
+| spaceship.cpp:18:20:18:22 | lhs |  | <none> |
+| spaceship.cpp:18:24:18:24 | i | lhs | <none> |
+| spaceship.cpp:22:41:22:101 | __builtin_lt_synthesizes_from_spaceship | const S &,const int & | 1 |
+| spaceship.cpp:22:41:22:101 | const S & |  | <none> |
+| spaceship.cpp:22:41:22:101 | const int & |  | <none> |
+| spaceship.cpp:23:41:23:89 | __builtin_lt_synthesizes_from_spaceship | int,int | 0 |
+| spaceship.cpp:23:41:23:89 | int |  | <none> |
+| spaceship.cpp:23:41:23:89 | int |  | <none> |
+| spaceship.cpp:24:41:24:101 | __builtin_gt_synthesizes_from_spaceship | const S &,const int & | 1 |
+| spaceship.cpp:24:41:24:101 | const S & |  | <none> |
+| spaceship.cpp:24:41:24:101 | const int & |  | <none> |
+| spaceship.cpp:25:41:25:89 | __builtin_gt_synthesizes_from_spaceship | int,int | 0 |
+| spaceship.cpp:25:41:25:89 | int |  | <none> |
+| spaceship.cpp:25:41:25:89 | int |  | <none> |
+| spaceship.cpp:26:41:26:101 | __builtin_le_synthesizes_from_spaceship | const S &,const int & | 1 |
+| spaceship.cpp:26:41:26:101 | const S & |  | <none> |
+| spaceship.cpp:26:41:26:101 | const int & |  | <none> |
+| spaceship.cpp:27:41:27:89 | __builtin_le_synthesizes_from_spaceship | int,int | 0 |
+| spaceship.cpp:27:41:27:89 | int |  | <none> |
+| spaceship.cpp:27:41:27:89 | int |  | <none> |
+| spaceship.cpp:28:41:28:101 | __builtin_ge_synthesizes_from_spaceship | const S &,const int & | 1 |
+| spaceship.cpp:28:41:28:101 | const S & |  | <none> |
+| spaceship.cpp:28:41:28:101 | const int & |  | <none> |
+| spaceship.cpp:29:41:29:89 | __builtin_ge_synthesizes_from_spaceship | int,int | 0 |
+| spaceship.cpp:29:41:29:89 | int |  | <none> |
+| spaceship.cpp:29:41:29:89 | int |  | <none> |
+| types.c:4:9:4:57 | __builtin_types_compatible_p | typeof(...),long | 0 |
+| types.c:4:9:4:57 | long |  | <none> |
+| types.c:4:9:4:57 | typeof(...) |  | <none> |
+| types.c:4:49:4:49 | s |  | <none> |
+| types.c:5:9:5:12 | call to puts | long | <none> |
+| types.c:5:14:5:19 | array to pointer conversion |  | <none> |
+| types.c:5:14:5:19 | long |  | long |
+| types.c:6:16:6:65 | __builtin_types_compatible_p | typeof(...),char * | 1 |
+| types.c:6:16:6:65 | char * |  | <none> |
+| types.c:6:16:6:65 | typeof(...) |  | <none> |
+| types.c:6:56:6:56 | s |  | <none> |
+| types.c:7:9:7:12 | call to puts | str | <none> |
+| types.c:7:14:7:18 | array to pointer conversion |  | <none> |
+| types.c:7:14:7:18 | str |  | str |
+| types.c:9:12:9:14 | (...) |  | 0 |
+| types.c:9:13:9:13 | 0 |  | 0 |
+| varargs.c:7:5:7:32 | __builtin_va_start | ap,args | <none> |
+| varargs.c:7:24:7:25 | ap |  | <none> |
+| varargs.c:7:24:7:25 | array to pointer conversion |  | <none> |
+| varargs.c:7:28:7:31 | args |  | <none> |
+| varargs.c:8:10:8:10 | i |  | <none> |
+| varargs.c:8:10:8:14 | ... = ... | i,0 | <none> |
+| varargs.c:8:14:8:14 | 0 |  | 0 |
+| varargs.c:8:17:8:17 | i |  | <none> |
+| varargs.c:8:17:8:24 | ... < ... | i,args | <none> |
+| varargs.c:8:21:8:24 | args |  | <none> |
+| varargs.c:8:27:8:27 | i |  | <none> |
+| varargs.c:8:27:8:29 | ... ++ | i | <none> |
+| varargs.c:9:9:9:9 | j |  | <none> |
+| varargs.c:9:9:9:37 | ... = ... | j,__builtin_va_arg | <none> |
+| varargs.c:9:13:9:37 | __builtin_va_arg | ap | <none> |
+| varargs.c:9:30:9:31 | ap |  | <none> |
+| varargs.c:9:30:9:31 | array to pointer conversion |  | <none> |
+| varargs.c:11:5:11:24 | __builtin_va_end | ap | <none> |
+| varargs.c:11:22:11:23 | ap |  | <none> |
+| varargs.c:11:22:11:23 | array to pointer conversion |  | <none> |
diff --git a/cpp/ql/test/library-tests/builtins/builtins/expr.ql b/cpp/ql/test/library-tests/builtins/builtins/expr.ql
new file mode 100644
index 000000000000..c638cf501562
--- /dev/null
+++ b/cpp/ql/test/library-tests/builtins/builtins/expr.ql
@@ -0,0 +1,5 @@
+import cpp
+
+from Expr e, string value
+where if exists(e.getValue()) then value = e.getValue().toString() else value = "<none>"
+select e, concat(int i | | e.getChild(i).toString(), "," order by i), value
diff --git a/cpp/ql/test/library-tests/builtins/builtins/spaceship.cpp b/cpp/ql/test/library-tests/builtins/builtins/spaceship.cpp
new file mode 100644
index 000000000000..94f978587b1f
--- /dev/null
+++ b/cpp/ql/test/library-tests/builtins/builtins/spaceship.cpp
@@ -0,0 +1,29 @@
+// semmle-extractor-options: --clang --clang_version 240000 -std=c++23
+
+namespace std {
+  struct strong_ordering {
+    int n;
+    constexpr operator int() const { return n; }
+    static const strong_ordering less, equal, greater;
+  };
+  constexpr strong_ordering strong_ordering::less = {-1};
+  constexpr strong_ordering strong_ordering::equal = {0};
+  constexpr strong_ordering strong_ordering::greater = {1};
+}
+
+struct S {
+  int i;
+
+  friend auto operator<=>(S lhs, int rhs) {
+    return rhs <=> lhs.i;
+  }
+};
+
+bool b_lt_synthesizes_from_spaceship1 = __builtin_lt_synthesizes_from_spaceship(const S&, const int&);
+bool b_lt_synthesizes_from_spaceship2 = __builtin_lt_synthesizes_from_spaceship(int, int);
+bool b_gt_synthesizes_from_spaceship1 = __builtin_gt_synthesizes_from_spaceship(const S&, const int&);
+bool b_gt_synthesizes_from_spaceship2 = __builtin_gt_synthesizes_from_spaceship(int, int);
+bool b_le_synthesizes_from_spaceship1 = __builtin_le_synthesizes_from_spaceship(const S&, const int&);
+bool b_le_synthesizes_from_spaceship2 = __builtin_le_synthesizes_from_spaceship(int, int);
+bool b_ge_synthesizes_from_spaceship1 = __builtin_ge_synthesizes_from_spaceship(const S&, const int&);
+bool b_ge_synthesizes_from_spaceship2 = __builtin_ge_synthesizes_from_spaceship(int, int);
diff --git a/cpp/ql/test/library-tests/builtins/type_traits/clang.cpp b/cpp/ql/test/library-tests/builtins/type_traits/clang.cpp
index 3db47a824ede..67664754f4e5 100644
--- a/cpp/ql/test/library-tests/builtins/type_traits/clang.cpp
+++ b/cpp/ql/test/library-tests/builtins/type_traits/clang.cpp
@@ -122,10 +122,20 @@ bool b_is_scoped_enum2 = __is_scoped_enum(int);
 bool b_is_trivially_relocatable1 = __is_trivially_relocatable(int);
 bool b_is_trivially_relocatable2 = __is_trivially_relocatable(void);
 
-struct S3{
+struct S3 {
     S3(S3 &);
     S3& operator=(S3&);
 };
 
-bool bok_is_bitwise_cloneable1 = __is_bitwise_cloneable(int);
-bool bok_is_bitwise_cloneable2 = __is_bitwise_cloneable(S3);
+bool b_is_bitwise_cloneable1 = __is_bitwise_cloneable(int);
+bool b_is_bitwise_cloneable2 = __is_bitwise_cloneable(S3);
+
+struct S4 : virtual S3 {
+    ~S4() = delete;
+};
+
+bool b_is_virtual_base_of1 = __builtin_is_virtual_base_of(int, S4);
+bool b_is_virtual_base_of2 = __builtin_is_virtual_base_of(S3, S4);
+
+bool b_is_implicit_lifetime1 = __builtin_is_implicit_lifetime(int);
+bool b_is_implicit_lifetime2 = __builtin_is_implicit_lifetime(S4);
diff --git a/cpp/ql/test/library-tests/builtins/type_traits/expr.expected b/cpp/ql/test/library-tests/builtins/type_traits/expr.expected
index 1728a48f4237..1580d5dba959 100644
--- a/cpp/ql/test/library-tests/builtins/type_traits/expr.expected
+++ b/cpp/ql/test/library-tests/builtins/type_traits/expr.expected
@@ -165,10 +165,20 @@
 | clang.cpp:122:36:122:66 | int |  | <none> |
 | clang.cpp:123:36:123:67 | __is_trivially_relocatable | void | 0 |
 | clang.cpp:123:36:123:67 | void |  | <none> |
-| clang.cpp:130:34:130:60 | __is_bitwise_cloneable | int | 1 |
-| clang.cpp:130:34:130:60 | int |  | <none> |
-| clang.cpp:131:34:131:59 | S3 |  | <none> |
-| clang.cpp:131:34:131:59 | __is_bitwise_cloneable | S3 | 0 |
+| clang.cpp:130:32:130:58 | __is_bitwise_cloneable | int | 1 |
+| clang.cpp:130:32:130:58 | int |  | <none> |
+| clang.cpp:131:32:131:57 | S3 |  | <none> |
+| clang.cpp:131:32:131:57 | __is_bitwise_cloneable | S3 | 0 |
+| clang.cpp:137:30:137:66 | S4 |  | <none> |
+| clang.cpp:137:30:137:66 | __builtin_is_virtual_base_of | int,S4 | 0 |
+| clang.cpp:137:30:137:66 | int |  | <none> |
+| clang.cpp:138:30:138:65 | S3 |  | <none> |
+| clang.cpp:138:30:138:65 | S4 |  | <none> |
+| clang.cpp:138:30:138:65 | __builtin_is_virtual_base_of | S3,S4 | 1 |
+| clang.cpp:140:32:140:66 | __builtin_is_implicit_lifetime | int | 1 |
+| clang.cpp:140:32:140:66 | int |  | <none> |
+| clang.cpp:141:32:141:65 | S4 |  | <none> |
+| clang.cpp:141:32:141:65 | __builtin_is_implicit_lifetime | S4 | 0 |
 | file://:0:0:0:0 | 0 |  | 0 |
 | file://:0:0:0:0 | 0 |  | 0 |
 | file://:0:0:0:0 | 1 |  | 1 |
@@ -225,6 +235,10 @@
 | gcc.cpp:37:32:37:67 | __is_nothrow_invocable | f_type,bool | 0 |
 | gcc.cpp:37:32:37:67 | bool |  | <none> |
 | gcc.cpp:37:32:37:67 | f_type |  | <none> |
+| gcc.cpp:39:25:39:52 | __builtin_is_structural | int | 1 |
+| gcc.cpp:39:25:39:52 | int |  | <none> |
+| gcc.cpp:40:25:40:54 | __builtin_is_structural | int && | 0 |
+| gcc.cpp:40:25:40:54 | int && |  | <none> |
 | ms.cpp:38:41:38:45 | 0 |  | 0 |
 | ms.cpp:88:27:88:45 | __has_assign | empty | 0 |
 | ms.cpp:88:27:88:45 | empty |  | <none> |
diff --git a/cpp/ql/test/library-tests/builtins/type_traits/expr.ql b/cpp/ql/test/library-tests/builtins/type_traits/expr.ql
index a7d2b436ebde..c638cf501562 100644
--- a/cpp/ql/test/library-tests/builtins/type_traits/expr.ql
+++ b/cpp/ql/test/library-tests/builtins/type_traits/expr.ql
@@ -1,15 +1,5 @@
 import cpp
 
-string childrenFrom(Expr e, int i) {
-  (
-    if i = 0
-    then result = e.getChild(i).toString() + childrenFrom(e, i + 1)
-    else result = "," + e.getChild(i).toString() + childrenFrom(e, i + 1)
-  )
-  or
-  i = e.getNumChild() and result = ""
-}
-
 from Expr e, string value
 where if exists(e.getValue()) then value = e.getValue().toString() else value = "<none>"
-select e, childrenFrom(e, 0), value
+select e, concat(int i | | e.getChild(i).toString(), "," order by i), value
diff --git a/cpp/ql/test/library-tests/builtins/type_traits/gcc.cpp b/cpp/ql/test/library-tests/builtins/type_traits/gcc.cpp
index 15f59812d2e9..7c6189b81aff 100644
--- a/cpp/ql/test/library-tests/builtins/type_traits/gcc.cpp
+++ b/cpp/ql/test/library-tests/builtins/type_traits/gcc.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --gnu_version 150000
+// semmle-extractor-options: --gnu_version 170000
 
 __attribute__ ((aligned(8))) int v;
 bool b_has_attribute1 = __builtin_has_attribute(v, aligned);
@@ -35,3 +35,6 @@ bool b_is_invocable2 = __is_invocable(f_type, bool);
 
 bool b_is_nothrow_invocable1 = __is_nothrow_invocable(f_type);
 bool b_is_nothrow_invocable2 = __is_nothrow_invocable(f_type, bool);
+
+bool b_is_structural1 = __builtin_is_structural(int);
+bool b_is_structural2 = __builtin_is_structural(int&&);