diff --git a/cpp/downgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/old.dbscheme b/cpp/downgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/old.dbscheme
new file mode 100644
index 000000000000..7e7c2f55670f
--- /dev/null
+++ b/cpp/downgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/old.dbscheme
@@ -0,0 +1,2517 @@
+
+/*- 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
+);
+
+/**
+ * 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(
+    string source_file: string ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file `trap_file`.
+ */
+in_trap(
+    int element: @element ref,
+    int trap_file: @trap ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/semmlecode.dbscheme b/cpp/downgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/semmlecode.dbscheme
new file mode 100644
index 000000000000..9439176c1d13
--- /dev/null
+++ b/cpp/downgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/semmlecode.dbscheme
@@ -0,0 +1,2489 @@
+
+/*- 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
+)
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/upgrade.properties b/cpp/downgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/upgrade.properties
new file mode 100644
index 000000000000..2f526418ae81
--- /dev/null
+++ b/cpp/downgrades/7e7c2f55670f8123d514cf542ccb1938118ac561/upgrade.properties
@@ -0,0 +1,5 @@
+description: Add trap_filename, source_file_uses_trap and in_trap relations
+compatibility: full
+trap_filename.rel: delete
+source_file_uses_trap.rel: delete
+in_trap.rel: delete
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 9439176c1d13..7e7c2f55670f 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -236,6 +236,34 @@ extractor_version(
     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
+);
+
+/**
+ * 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(
+    string source_file: string ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file `trap_file`.
+ */
+in_trap(
+    int element: @element ref,
+    int trap_file: @trap ref
+);
+
 pch_uses(
     int pch: @pch ref,
     int compilation: @compilation ref,
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index ee25206a25d1..1c53061ef50a 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>12591</v>
+            <v>12592</v>
         </e>
         <e>
             <k>@externalDataElement</k>
@@ -10,19 +10,23 @@
         </e>
         <e>
             <k>@file</k>
-            <v>64946</v>
+            <v>64952</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>12339</v>
+            <v>12340</v>
         </e>
         <e>
             <k>@diagnostic</k>
             <v>357</v>
         </e>
+        <e>
+            <k>@trap</k>
+            <v>1</v>
+        </e>
         <e>
             <k>@location_default</k>
-            <v>46837407</v>
+            <v>46837429</v>
         </e>
         <e>
             <k>@pch</k>
@@ -30,7 +34,7 @@
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>40306104</v>
+            <v>40306124</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
@@ -38,7 +42,7 @@
         </e>
         <e>
             <k>@normal_function</k>
-            <v>2734629</v>
+            <v>2734381</v>
         </e>
         <e>
             <k>@unknown_function</k>
@@ -46,7 +50,7 @@
         </e>
         <e>
             <k>@constructor</k>
-            <v>694334</v>
+            <v>694333</v>
         </e>
         <e>
             <k>@destructor</k>
@@ -70,15 +74,15 @@
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4193289</v>
+            <v>4193664</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>9367854</v>
+            <v>9368481</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>1629527</v>
+            <v>1629528</v>
         </e>
         <e>
             <k>@namespace_decl</k>
@@ -86,7 +90,7 @@
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>266844</v>
+            <v>266868</v>
         </e>
         <e>
             <k>@using_directive</k>
@@ -98,11 +102,11 @@
         </e>
         <e>
             <k>@static_assert</k>
-            <v>172749</v>
+            <v>172750</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>7011797</v>
+            <v>7010805</v>
         </e>
         <e>
             <k>@membervariable</k>
@@ -110,11 +114,11 @@
         </e>
         <e>
             <k>@globalvariable</k>
-            <v>492566</v>
+            <v>492567</v>
         </e>
         <e>
             <k>@localvariable</k>
-            <v>724695</v>
+            <v>724674</v>
         </e>
         <e>
             <k>@enumconstant</k>
@@ -354,11 +358,11 @@
         </e>
         <e>
             <k>@pointer</k>
-            <v>451498</v>
+            <v>451499</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
-            <v>691559</v>
+            <v>691560</v>
         </e>
         <e>
             <k>@array</k>
@@ -366,7 +370,7 @@
         </e>
         <e>
             <k>@routineptr</k>
-            <v>679848</v>
+            <v>679846</v>
         </e>
         <e>
             <k>@reference</k>
@@ -392,10 +396,6 @@
             <k>@scalable_vector</k>
             <v>1</v>
         </e>
-        <e>
-            <k>@decltype</k>
-            <v>101757</v>
-        </e>
         <e>
             <k>@typeof</k>
             <v>811</v>
@@ -474,11 +474,15 @@
         </e>
         <e>
             <k>@remove_reference</k>
-            <v>5706</v>
+            <v>5705</v>
+        </e>
+        <e>
+            <k>@decltype</k>
+            <v>101757</v>
         </e>
         <e>
             <k>@struct</k>
-            <v>976596</v>
+            <v>976682</v>
         </e>
         <e>
             <k>@union</k>
@@ -490,11 +494,11 @@
         </e>
         <e>
             <k>@template_parameter</k>
-            <v>864417</v>
+            <v>864494</v>
         </e>
         <e>
             <k>@alias</k>
-            <v>1755743</v>
+            <v>1755899</v>
         </e>
         <e>
             <k>@unknown_usertype</k>
@@ -506,11 +510,11 @@
         </e>
         <e>
             <k>@template_template_parameter</k>
-            <v>6090</v>
+            <v>6091</v>
         </e>
         <e>
             <k>@proxy_class</k>
-            <v>48241</v>
+            <v>48246</v>
         </e>
         <e>
             <k>@scoped_enum</k>
@@ -518,7 +522,7 @@
         </e>
         <e>
             <k>@template_struct</k>
-            <v>211176</v>
+            <v>211194</v>
         </e>
         <e>
             <k>@template_class</k>
@@ -530,11 +534,11 @@
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6349607</v>
+            <v>6349610</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>5911106</v>
+            <v>5911109</v>
         </e>
         <e>
             <k>@concept_template</k>
@@ -542,11 +546,11 @@
         </e>
         <e>
             <k>@routinetype</k>
-            <v>600578</v>
+            <v>600577</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>9677</v>
+            <v>9678</v>
         </e>
         <e>
             <k>@specifier</k>
@@ -578,7 +582,7 @@
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>71584</v>
+            <v>71632</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
@@ -598,19 +602,19 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>473788</v>
+            <v>473787</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>767816</v>
+            <v>767814</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>11208571</v>
+            <v>11208576</v>
         </e>
         <e>
             <k>@namespace</k>
-            <v>8615</v>
+            <v>8616</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
@@ -618,15 +622,15 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>3042586</v>
+            <v>3042541</v>
         </e>
         <e>
             <k>@value</k>
-            <v>13541557</v>
+            <v>13541563</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>2244826</v>
+            <v>2244830</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -634,15 +638,15 @@
         </e>
         <e>
             <k>@indirect</k>
-            <v>402173</v>
+            <v>402174</v>
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1953950</v>
+            <v>1953951</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>4915709</v>
+            <v>4915711</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -654,7 +658,7 @@
         </e>
         <e>
             <k>@complementexpr</k>
-            <v>38187</v>
+            <v>38188</v>
         </e>
         <e>
             <k>@notexpr</k>
@@ -662,7 +666,7 @@
         </e>
         <e>
             <k>@postincrexpr</k>
-            <v>84578</v>
+            <v>84579</v>
         </e>
         <e>
             <k>@postdecrexpr</k>
@@ -678,11 +682,11 @@
         </e>
         <e>
             <k>@conditionalexpr</k>
-            <v>897971</v>
+            <v>897972</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>580446</v>
+            <v>580447</v>
         </e>
         <e>
             <k>@subexpr</k>
@@ -698,7 +702,7 @@
         </e>
         <e>
             <k>@remexpr</k>
-            <v>15908</v>
+            <v>15907</v>
         </e>
         <e>
             <k>@paddexpr</k>
@@ -734,7 +738,7 @@
         </e>
         <e>
             <k>@eqexpr</k>
-            <v>643439</v>
+            <v>643440</v>
         </e>
         <e>
             <k>@neexpr</k>
@@ -814,7 +818,7 @@
         </e>
         <e>
             <k>@orlogicalexpr</k>
-            <v>1103651</v>
+            <v>1103652</v>
         </e>
         <e>
             <k>@commaexpr</k>
@@ -826,7 +830,7 @@
         </e>
         <e>
             <k>@callexpr</k>
-            <v>238857</v>
+            <v>238856</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -846,7 +850,7 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>8255498</v>
+            <v>8255502</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
@@ -862,7 +866,7 @@
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>5726204</v>
+            <v>5726119</v>
         </e>
         <e>
             <k>@type_operand</k>
@@ -878,7 +882,7 @@
         </e>
         <e>
             <k>@literal</k>
-            <v>7985020</v>
+            <v>7985002</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -886,11 +890,11 @@
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>6027719</v>
+            <v>6027721</v>
         </e>
         <e>
             <k>@temp_init</k>
-            <v>980662</v>
+            <v>980663</v>
         </e>
         <e>
             <k>@errorexpr</k>
@@ -898,11 +902,11 @@
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1880186</v>
+            <v>1880187</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2094072</v>
+            <v>2094067</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
@@ -962,7 +966,7 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1553672</v>
+            <v>1553675</v>
         </e>
         <e>
             <k>@new_expr</k>
@@ -978,7 +982,7 @@
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>407684</v>
+            <v>407678</v>
         </e>
         <e>
             <k>@braced_init_list</k>
@@ -1118,7 +1122,7 @@
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>39567</v>
+            <v>39566</v>
         </e>
         <e>
             <k>@static_cast</k>
@@ -1134,7 +1138,7 @@
         </e>
         <e>
             <k>@dynamic_cast</k>
-            <v>788</v>
+            <v>789</v>
         </e>
         <e>
             <k>@lambdaexpr</k>
@@ -1418,7 +1422,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>844478</v>
+            <v>844466</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1530,7 +1534,7 @@
         </e>
         <e>
             <k>@concept_id</k>
-            <v>90160</v>
+            <v>90159</v>
         </e>
         <e>
             <k>@isinvocable</k>
@@ -1550,11 +1554,11 @@
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>2031827</v>
+            <v>2031828</v>
         </e>
         <e>
             <k>@stmt_if</k>
-            <v>990318</v>
+            <v>990319</v>
         </e>
         <e>
             <k>@stmt_while</k>
@@ -1562,19 +1566,19 @@
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>157264</v>
+            <v>157278</v>
         </e>
         <e>
             <k>@stmt_label</k>
-            <v>77727</v>
+            <v>77734</v>
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1238149</v>
+            <v>1238238</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1724481</v>
+            <v>1724482</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
@@ -1586,11 +1590,11 @@
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>833624</v>
+            <v>833612</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>410623</v>
+            <v>410617</v>
         </e>
         <e>
             <k>@stmt_asm</k>
@@ -1598,11 +1602,11 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>770029</v>
+            <v>770031</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>428127</v>
+            <v>428121</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1610,7 +1614,7 @@
         </e>
         <e>
             <k>@stmt_break</k>
-            <v>137506</v>
+            <v>137507</v>
         </e>
         <e>
             <k>@stmt_try_block</k>
@@ -1674,7 +1678,7 @@
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>21827</v>
+            <v>21829</v>
         </e>
         <e>
             <k>@ppd_else</k>
@@ -1686,15 +1690,15 @@
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>317263</v>
+            <v>317291</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2743340</v>
+            <v>2743342</v>
         </e>
         <e>
             <k>@ppd_undef</k>
-            <v>100180</v>
+            <v>100181</v>
         </e>
         <e>
             <k>@ppd_pragma</k>
@@ -1768,11 +1772,11 @@
     <stats>
         <relation>
             <name>compilations</name>
-            <cardinality>12591</cardinality>
+            <cardinality>12592</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12591</v>
+                    <v>12592</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1790,7 +1794,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12591</v>
+                                    <v>12592</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1816,11 +1820,11 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1008080</cardinality>
+            <cardinality>1008169</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12591</v>
+                    <v>12592</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -1828,7 +1832,7 @@
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29149</v>
+                    <v>29151</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1887,7 +1891,7 @@
                                 <b>
                                     <a>98</a>
                                     <b>99</b>
-                                    <v>1335</v>
+                                    <v>1336</v>
                                 </b>
                                 <b>
                                     <a>100</a>
@@ -2156,12 +2160,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13349</v>
+                                    <v>13350</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12633</v>
+                                    <v>12634</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2187,12 +2191,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19303</v>
+                                    <v>19304</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8688</v>
+                                    <v>8689</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2207,11 +2211,11 @@
         </relation>
         <relation>
             <name>compilation_expanded_args</name>
-            <cardinality>1008080</cardinality>
+            <cardinality>1008169</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12591</v>
+                    <v>12592</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -2219,7 +2223,7 @@
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29149</v>
+                    <v>29151</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2278,7 +2282,7 @@
                                 <b>
                                     <a>98</a>
                                     <b>99</b>
-                                    <v>1335</v>
+                                    <v>1336</v>
                                 </b>
                                 <b>
                                     <a>100</a>
@@ -2547,12 +2551,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13349</v>
+                                    <v>13350</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12633</v>
+                                    <v>12634</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2578,12 +2582,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19303</v>
+                                    <v>19304</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8688</v>
+                                    <v>8689</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2908,7 +2912,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>18516</v>
+                    <v>15412</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2989,12 +2993,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>980</v>
+                                    <v>1034</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>381</v>
+                                    <v>326</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -3003,8 +3007,8 @@
                                 </b>
                                 <b>
                                     <a>8</a>
-                                    <b>10</b>
-                                    <v>217</v>
+                                    <b>9</b>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -3013,28 +3017,23 @@
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>15</b>
+                                    <b>13</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>18</b>
-                                    <v>108</v>
-                                </b>
-                                <b>
-                                    <a>18</a>
-                                    <b>19</b>
+                                    <a>14</a>
+                                    <b>17</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>54</b>
+                                    <a>17</a>
+                                    <b>21</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>133</a>
-                                    <b>134</b>
-                                    <v>54</v>
+                                    <a>24</a>
+                                    <b>94</b>
+                                    <v>217</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3102,47 +3101,47 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1797</v>
+                                    <v>1143</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>599</v>
+                                    <v>1252</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>217</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>544</v>
+                                    <v>653</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>8</b>
+                                    <b>9</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
-                                    <v>326</v>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>217</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
-                                    <b>18</b>
+                                    <a>10</a>
+                                    <b>15</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>22</a>
-                                    <b>49</b>
+                                    <a>16</a>
+                                    <b>45</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>94</a>
-                                    <b>95</b>
-                                    <v>54</v>
+                                    <a>50</a>
+                                    <b>94</b>
+                                    <v>108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3198,13 +3197,13 @@
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>187</a>
-                                    <b>188</b>
+                                    <a>148</a>
+                                    <b>149</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>197</a>
-                                    <b>198</b>
+                                    <a>160</a>
+                                    <b>161</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -3221,22 +3220,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12362</v>
+                                    <v>9421</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3757</v>
+                                    <v>3104</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1688</v>
+                                    <v>1797</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>39</b>
-                                    <v>708</v>
+                                    <b>44</b>
+                                    <v>1089</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3252,27 +3251,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11273</v>
+                                    <v>8604</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>4302</v>
+                                    <v>2668</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1470</v>
+                                    <v>1851</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>44</b>
-                                    <v>1416</v>
+                                    <b>5</b>
+                                    <v>925</v>
                                 </b>
                                 <b>
-                                    <a>63</a>
-                                    <b>64</b>
-                                    <v>54</v>
+                                    <a>5</a>
+                                    <b>15</b>
+                                    <v>1198</v>
+                                </b>
+                                <b>
+                                    <a>43</a>
+                                    <b>73</b>
+                                    <v>163</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3288,12 +3292,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15630</v>
+                                    <v>13560</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2886</v>
+                                    <v>1851</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3569,19 +3573,19 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>12591</cardinality>
+            <cardinality>12592</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12591</v>
+                    <v>12592</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>9656</v>
+                    <v>9489</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>210</v>
+                    <v>231</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3595,7 +3599,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12591</v>
+                                    <v>12592</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3611,7 +3615,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12591</v>
+                                    <v>12592</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3627,17 +3631,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8394</v>
+                                    <v>7953</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>809</v>
+                                    <v>1052</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>32</b>
-                                    <v>452</v>
+                                    <b>29</b>
+                                    <v>483</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3653,12 +3657,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9046</v>
+                                    <v>8847</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>610</v>
+                                    <v>641</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3674,76 +3678,46 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42</v>
+                                    <v>73</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>10</v>
+                                    <b>5</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>6</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
+                                    <b>9</b>
                                     <v>21</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>31</a>
-                                    <b>32</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>61</a>
-                                    <b>62</b>
-                                    <v>10</v>
+                                    <a>12</a>
+                                    <b>14</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>172</a>
-                                    <b>173</b>
-                                    <v>10</v>
+                                    <a>19</a>
+                                    <b>33</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>231</a>
-                                    <b>232</b>
-                                    <v>10</v>
+                                    <a>60</a>
+                                    <b>179</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>286</a>
-                                    <b>287</b>
-                                    <v>10</v>
+                                    <a>233</a>
+                                    <b>293</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>321</a>
-                                    <b>322</b>
+                                    <a>312</a>
+                                    <b>313</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -3760,76 +3734,46 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>42</v>
+                                    <v>73</v>
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>3</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>3</a>
-                                    <b>4</b>
-                                    <v>10</v>
+                                    <b>5</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>6</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>7</a>
-                                    <b>8</b>
+                                    <b>9</b>
                                     <v>21</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>11</a>
-                                    <b>12</b>
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>20</a>
-                                    <b>21</b>
-                                    <v>10</v>
+                                    <a>12</a>
+                                    <b>14</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>31</a>
+                                    <a>18</a>
                                     <b>32</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>61</a>
-                                    <b>62</b>
-                                    <v>10</v>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>165</a>
-                                    <b>166</b>
-                                    <v>10</v>
+                                    <a>59</a>
+                                    <b>154</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
                                     <a>168</a>
-                                    <b>169</b>
-                                    <v>10</v>
-                                </b>
-                                <b>
-                                    <a>216</a>
-                                    <b>217</b>
-                                    <v>10</v>
+                                    <b>219</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>240</a>
-                                    <b>241</b>
+                                    <a>245</a>
+                                    <b>246</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -4067,11 +4011,11 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>46837407</cardinality>
+            <cardinality>46837429</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>46837407</v>
+                    <v>46837429</v>
                 </e>
                 <e>
                     <k>file</k>
@@ -4079,7 +4023,7 @@
                 </e>
                 <e>
                     <k>beginLine</k>
-                    <v>7483207</v>
+                    <v>7483211</v>
                 </e>
                 <e>
                     <k>beginColumn</k>
@@ -4087,7 +4031,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>7484203</v>
+                    <v>7484207</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -4105,7 +4049,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837407</v>
+                                    <v>46837429</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4121,7 +4065,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837407</v>
+                                    <v>46837429</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4137,7 +4081,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837407</v>
+                                    <v>46837429</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4153,7 +4097,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837407</v>
+                                    <v>46837429</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4169,7 +4113,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837407</v>
+                                    <v>46837429</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4570,12 +4514,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4945829</v>
+                                    <v>4945831</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>778673</v>
+                                    <v>778674</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -4590,7 +4534,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>96</b>
-                                    <v>561386</v>
+                                    <v>561387</v>
                                 </b>
                                 <b>
                                     <a>96</a>
@@ -4611,12 +4555,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5008053</v>
+                                    <v>5008055</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1216856</v>
+                                    <v>1216857</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -4647,7 +4591,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5629548</v>
+                                    <v>5629551</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -4662,7 +4606,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>564995</v>
+                                    <v>564996</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -4683,7 +4627,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7018144</v>
+                                    <v>7018147</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -4704,7 +4648,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5014275</v>
+                                    <v>5014278</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5125,17 +5069,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4943589</v>
+                                    <v>4943591</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>782033</v>
+                                    <v>782034</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>541972</v>
+                                    <v>541973</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -5166,17 +5110,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5005066</v>
+                                    <v>5005068</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1220465</v>
+                                    <v>1220466</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>631077</v>
+                                    <v>631078</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -5202,7 +5146,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7035318</v>
+                                    <v>7035321</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5223,7 +5167,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5628179</v>
+                                    <v>5628182</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5238,12 +5182,12 @@
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>568355</v>
+                                    <v>568356</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>89</b>
-                                    <v>224504</v>
+                                    <v>224505</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5259,7 +5203,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5012782</v>
+                                    <v>5012784</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5599,15 +5543,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>64946</cardinality>
+            <cardinality>64952</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>64946</v>
+                    <v>64952</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>64946</v>
+                    <v>64952</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5621,7 +5565,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64946</v>
+                                    <v>64952</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5637,7 +5581,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>64946</v>
+                                    <v>64952</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5647,15 +5591,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>12339</cardinality>
+            <cardinality>12340</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12339</v>
+                    <v>12340</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>12339</v>
+                    <v>12340</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5669,7 +5613,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12339</v>
+                                    <v>12340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5685,7 +5629,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12339</v>
+                                    <v>12340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5695,15 +5639,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>77264</cardinality>
+            <cardinality>77271</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>12339</v>
+                    <v>12340</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>77264</v>
+                    <v>77271</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5717,7 +5661,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6006</v>
+                                    <v>6007</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5752,7 +5696,7 @@
                                 <b>
                                     <a>44</a>
                                     <b>151</b>
-                                    <v>262</v>
+                                    <v>263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5768,7 +5712,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77264</v>
+                                    <v>77271</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5778,11 +5722,11 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>805927</cardinality>
+            <cardinality>805928</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>804807</v>
+                    <v>804808</v>
                 </e>
                 <e>
                     <k>num_lines</k>
@@ -5808,7 +5752,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>803687</v>
+                                    <v>803688</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5829,7 +5773,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>803687</v>
+                                    <v>803688</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -6872,6 +6816,150 @@
                 </dep>
             </dependencies>
         </relation>
+        <relation>
+            <name>trap_filename</name>
+            <cardinality>1</cardinality>
+            <columnsizes>
+                <e>
+                    <k>trap</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>filename</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>trap</src>
+                    <trg>filename</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>filename</src>
+                    <trg>trap</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>source_file_uses_trap</name>
+            <cardinality>1</cardinality>
+            <columnsizes>
+                <e>
+                    <k>source_file</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>trap_file</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>source_file</src>
+                    <trg>trap_file</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>trap_file</src>
+                    <trg>source_file</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>in_trap</name>
+            <cardinality>1</cardinality>
+            <columnsizes>
+                <e>
+                    <k>element</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>trap_file</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>element</src>
+                    <trg>trap_file</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>trap_file</src>
+                    <trg>element</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs>
+                                <b>
+                                    <a>1</a>
+                                    <b>2</b>
+                                    <v>1</v>
+                                </b>
+                            </bs>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
         <relation>
             <name>pch_uses</name>
             <cardinality>4121</cardinality>
@@ -7256,11 +7344,11 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>4183401</cardinality>
+            <cardinality>4183771</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5743</v>
+                    <v>5744</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -7268,11 +7356,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>58477</v>
+                    <v>58482</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>39352</v>
+                    <v>39356</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7291,7 +7379,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5543</v>
+                                    <v>5544</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7517,7 +7605,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10982</v>
+                                    <v>10983</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7527,7 +7615,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>5038</v>
+                                    <v>5039</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -7537,12 +7625,12 @@
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>4575</v>
+                                    <v>4576</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>4312</v>
+                                    <v>4313</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -7557,7 +7645,7 @@
                                 <b>
                                     <a>27</a>
                                     <b>47</b>
-                                    <v>4817</v>
+                                    <v>4818</v>
                                 </b>
                                 <b>
                                     <a>47</a>
@@ -7588,7 +7676,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58477</v>
+                                    <v>58482</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7604,7 +7692,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11539</v>
+                                    <v>11540</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7619,7 +7707,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4049</v>
+                                    <v>4050</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -7649,7 +7737,7 @@
                                 <b>
                                     <a>41</a>
                                     <b>95</b>
-                                    <v>4449</v>
+                                    <v>4450</v>
                                 </b>
                                 <b>
                                     <a>95</a>
@@ -7680,7 +7768,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3176</v>
+                                    <v>3177</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -7690,7 +7778,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>2955</v>
+                                    <v>2956</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -7705,7 +7793,7 @@
                                 <b>
                                     <a>24</a>
                                     <b>51</b>
-                                    <v>3523</v>
+                                    <v>3524</v>
                                 </b>
                                 <b>
                                     <a>51</a>
@@ -7751,7 +7839,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39342</v>
+                                    <v>39345</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7797,7 +7885,7 @@
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>3439</v>
+                                    <v>3440</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -7807,7 +7895,7 @@
                                 <b>
                                     <a>28</a>
                                     <b>34</b>
-                                    <v>3134</v>
+                                    <v>3135</v>
                                 </b>
                                 <b>
                                     <a>34</a>
@@ -7817,7 +7905,7 @@
                                 <b>
                                     <a>41</a>
                                     <b>66</b>
-                                    <v>2976</v>
+                                    <v>2977</v>
                                 </b>
                                 <b>
                                     <a>66</a>
@@ -7827,7 +7915,7 @@
                                 <b>
                                     <a>92</a>
                                     <b>113</b>
-                                    <v>2976</v>
+                                    <v>2977</v>
                                 </b>
                                 <b>
                                     <a>113</a>
@@ -7847,15 +7935,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>150011348</cardinality>
+            <cardinality>150011419</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24673488</v>
+                    <v>24673500</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3705719</v>
+                    <v>3705721</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7869,32 +7957,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>2209721</v>
+                                    <v>2209722</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1475128</v>
+                                    <v>1475129</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1620534</v>
+                                    <v>1620535</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>6583216</v>
+                                    <v>6583219</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>8719889</v>
+                                    <v>8719893</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>3557411</v>
+                                    <v>3557413</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -7920,7 +8008,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>743308</v>
+                                    <v>743309</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7955,7 +8043,7 @@
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>307829</v>
+                                    <v>307830</v>
                                 </b>
                                 <b>
                                     <a>339</a>
@@ -7975,15 +8063,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48740809</cardinality>
+            <cardinality>48740832</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7045460</v>
+                    <v>7045463</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3803509</v>
+                    <v>3803511</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7997,7 +8085,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3847103</v>
+                                    <v>3847105</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8017,7 +8105,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>12</b>
-                                    <v>535214</v>
+                                    <v>535215</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -8048,7 +8136,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>316639</v>
+                                    <v>316640</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -8113,11 +8201,11 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>40387470</cardinality>
+            <cardinality>40387489</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>40387470</v>
+                    <v>40387489</v>
                 </e>
                 <e>
                     <k>macro_id</k>
@@ -8125,7 +8213,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5925539</v>
+                    <v>5925541</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -8143,7 +8231,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40387470</v>
+                                    <v>40387489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8159,7 +8247,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40387470</v>
+                                    <v>40387489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8175,7 +8263,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40387470</v>
+                                    <v>40387489</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8191,7 +8279,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>61105</v>
+                                    <v>61106</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8319,7 +8407,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5261596</v>
+                                    <v>5261599</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8345,7 +8433,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5903373</v>
+                                    <v>5903376</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8366,7 +8454,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5925539</v>
+                                    <v>5925541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8439,15 +8527,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>33684436</cardinality>
+            <cardinality>33684452</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33684436</v>
+                    <v>33684452</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>15941258</v>
+                    <v>15941266</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8461,7 +8549,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33684436</v>
+                                    <v>33684452</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8477,22 +8565,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7815086</v>
+                                    <v>7815090</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1595835</v>
+                                    <v>1595836</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4707394</v>
+                                    <v>4707397</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1296895</v>
+                                    <v>1296896</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -8507,15 +8595,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>6022277</cardinality>
+            <cardinality>6022573</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4208236</v>
+                    <v>4208559</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2272393</v>
+                    <v>2272360</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8529,22 +8617,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3284816</v>
+                                    <v>3285153</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>489028</v>
+                                    <v>489021</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>8602</v>
+                                    <v>8601</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>412639</v>
+                                    <v>412633</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -8565,12 +8653,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1332220</v>
+                                    <v>1332200</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>481413</v>
+                                    <v>481406</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8580,12 +8668,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>426926</v>
+                                    <v>426920</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>522</b>
-                                    <v>24047</v>
+                                    <v>24046</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8595,11 +8683,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>82169662</cardinality>
+            <cardinality>82174179</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26182114</v>
+                    <v>26181675</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -8607,7 +8695,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>341868</v>
+                    <v>341898</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8621,22 +8709,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9643579</v>
+                                    <v>9641676</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9733520</v>
+                                    <v>9734381</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4982515</v>
+                                    <v>4982956</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1822499</v>
+                                    <v>1822661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8652,22 +8740,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9825469</v>
+                                    <v>9823583</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9751034</v>
+                                    <v>9751897</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4826449</v>
+                                    <v>4826877</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1779160</v>
+                                    <v>1779317</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8692,7 +8780,7 @@
                                 </b>
                                 <b>
                                     <a>646904</a>
-                                    <b>2488947</b>
+                                    <b>2488685</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -8735,52 +8823,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39542</v>
+                                    <v>39545</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>62074</v>
+                                    <v>62080</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20933</v>
+                                    <v>20935</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>34440</v>
+                                    <v>34443</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>39089</v>
+                                    <v>39093</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>30748</v>
+                                    <v>30750</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>28875</v>
+                                    <v>28878</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>25772</v>
+                                    <v>25774</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>57</b>
-                                    <v>27024</v>
+                                    <v>27026</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>517</b>
-                                    <v>25909</v>
+                                    <v>25911</v>
                                 </b>
                                 <b>
                                     <a>518</a>
@@ -8801,17 +8889,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>242187</v>
+                                    <v>242208</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>89509</v>
+                                    <v>89517</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>10172</v>
+                                    <v>10173</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8821,11 +8909,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>82169662</cardinality>
+            <cardinality>82174179</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26182114</v>
+                    <v>26181675</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -8833,7 +8921,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>207052</v>
+                    <v>207070</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8847,22 +8935,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9643579</v>
+                                    <v>9641676</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9733520</v>
+                                    <v>9734381</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4982515</v>
+                                    <v>4982956</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1822499</v>
+                                    <v>1822661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8878,22 +8966,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12591345</v>
+                                    <v>12589703</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8396151</v>
+                                    <v>8396895</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4208269</v>
+                                    <v>4208641</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>986347</v>
+                                    <v>986434</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8918,7 +9006,7 @@
                                 </b>
                                 <b>
                                     <a>646904</a>
-                                    <b>2488947</b>
+                                    <b>2488685</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -8961,22 +9049,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21743</v>
+                                    <v>21745</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26750</v>
+                                    <v>26753</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>43297</v>
+                                    <v>43301</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15842</v>
+                                    <v>15843</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -8986,32 +9074,32 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>18324</v>
+                                    <v>18326</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>18882</v>
+                                    <v>18883</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>18251</v>
+                                    <v>18252</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>51</b>
-                                    <v>15694</v>
+                                    <v>15696</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>251</b>
-                                    <v>15547</v>
+                                    <v>15548</v>
                                 </b>
                                 <b>
                                     <a>251</a>
-                                    <b>1169678</b>
-                                    <v>9467</v>
+                                    <b>1169416</b>
+                                    <v>9468</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9027,17 +9115,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>104625</v>
+                                    <v>104634</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>88551</v>
+                                    <v>88559</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>66</b>
-                                    <v>13875</v>
+                                    <v>13876</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9047,15 +9135,15 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4043204</cardinality>
+            <cardinality>4042957</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4043204</v>
+                    <v>4042957</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1689262</v>
+                    <v>1689263</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -9073,7 +9161,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4043204</v>
+                                    <v>4042957</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9089,7 +9177,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4043204</v>
+                                    <v>4042957</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9105,12 +9193,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1441361</v>
+                                    <v>1441611</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>140377</v>
+                                    <v>140128</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -9131,7 +9219,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1686400</v>
+                                    <v>1686401</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9180,8 +9268,8 @@
                                     <v>124</v>
                                 </b>
                                 <b>
-                                    <a>21974</a>
-                                    <b>21975</b>
+                                    <a>21972</a>
+                                    <b>21973</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -9238,26 +9326,26 @@
         </relation>
         <relation>
             <name>builtin_functions</name>
-            <cardinality>30800</cardinality>
+            <cardinality>30803</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30800</v>
+                    <v>30803</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1134648</cardinality>
+            <cardinality>1134646</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1130925</v>
+                    <v>1130923</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1134648</v>
+                    <v>1134646</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9271,7 +9359,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1127744</v>
+                                    <v>1127741</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9292,7 +9380,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1134648</v>
+                                    <v>1134646</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9302,15 +9390,15 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4060503</cardinality>
+            <cardinality>4060256</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4043204</v>
+                    <v>4042957</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>617761</v>
+                    <v>617762</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9324,7 +9412,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4025906</v>
+                                    <v>4025659</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9656,33 +9744,33 @@
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>87800</cardinality>
+            <cardinality>87799</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>87800</v>
+                    <v>87799</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>51526</cardinality>
+            <cardinality>51525</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>51526</v>
+                    <v>51525</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>4041711</cardinality>
+            <cardinality>4041464</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4041711</v>
+                    <v>4041464</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -9840,15 +9928,15 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4199263</cardinality>
+            <cardinality>4199638</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4193289</v>
+                    <v>4193664</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4018688</v>
+                    <v>4018441</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -9856,11 +9944,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1687769</v>
+                    <v>1687770</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2806436</v>
+                    <v>2806437</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9874,7 +9962,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4193289</v>
+                                    <v>4193664</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9890,7 +9978,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4187316</v>
+                                    <v>4187691</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9911,7 +9999,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4193289</v>
+                                    <v>4193664</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9927,7 +10015,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4193289</v>
+                                    <v>4193664</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9943,12 +10031,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3858647</v>
+                                    <v>3857778</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>160040</v>
+                                    <v>160662</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9964,7 +10052,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4000394</v>
+                                    <v>4000147</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9985,7 +10073,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4018688</v>
+                                    <v>4018441</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10001,12 +10089,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3878435</v>
+                                    <v>3877814</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>140253</v>
+                                    <v>140626</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10022,7 +10110,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>294444</v>
+                                    <v>294445</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10032,7 +10120,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48285</v>
+                                    <v>48286</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -10041,7 +10129,7 @@
                                 </b>
                                 <b>
                                     <a>364</a>
-                                    <b>10295</b>
+                                    <b>10296</b>
                                     <v>1244</v>
                                 </b>
                             </bs>
@@ -10076,7 +10164,7 @@
                                     <v>45797</v>
                                 </b>
                                 <b>
-                                    <a>1485</a>
+                                    <a>1483</a>
                                     <b>9907</b>
                                     <v>248</v>
                                 </b>
@@ -10094,7 +10182,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>490326</v>
+                                    <v>490327</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10156,7 +10244,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1328362</v>
+                                    <v>1328363</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10166,12 +10254,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>129550</v>
+                                    <v>129426</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>3167</b>
-                                    <v>36463</v>
+                                    <b>3169</b>
+                                    <v>36587</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10187,12 +10275,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1440863</v>
+                                    <v>1441113</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>140875</v>
+                                    <v>140626</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -10213,7 +10301,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1598166</v>
+                                    <v>1598167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10234,7 +10322,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1363954</v>
+                                    <v>1363955</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10260,12 +10348,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2413303</v>
+                                    <v>2413180</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>252008</v>
+                                    <v>252132</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10286,12 +10374,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2431971</v>
+                                    <v>2431847</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>233838</v>
+                                    <v>233963</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10312,7 +10400,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2692317</v>
+                                    <v>2692318</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10333,7 +10421,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2767359</v>
+                                    <v>2767360</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10348,11 +10436,11 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1418836</cardinality>
+            <cardinality>1418837</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1418836</v>
+                    <v>1418837</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -10381,7 +10469,7 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>4269576</cardinality>
+            <cardinality>4269578</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -10413,7 +10501,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1097510</v>
+                                    <v>1097511</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -10679,11 +10767,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>1160854</cardinality>
+            <cardinality>1160979</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1160854</v>
+                    <v>1160979</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -10949,11 +11037,11 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7294544</cardinality>
+            <cardinality>7295169</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7294544</v>
+                    <v>7295169</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -10961,7 +11049,7 @@
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3523881</v>
+                    <v>3524256</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10975,7 +11063,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7294544</v>
+                                    <v>7295169</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10991,7 +11079,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7294544</v>
+                                    <v>7295169</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11026,12 +11114,12 @@
                                 </b>
                                 <b>
                                     <a>343</a>
-                                    <b>16218</b>
+                                    <b>16219</b>
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>28316</a>
-                                    <b>28317</b>
+                                    <a>28319</a>
+                                    <b>28320</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -11067,12 +11155,12 @@
                                 </b>
                                 <b>
                                     <a>343</a>
-                                    <b>16218</b>
+                                    <b>16219</b>
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>28316</a>
-                                    <b>28317</b>
+                                    <a>28319</a>
+                                    <b>28320</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -11089,7 +11177,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1505701</v>
+                                    <v>1505951</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11099,7 +11187,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>600712</v>
+                                    <v>600837</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -11125,7 +11213,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1505701</v>
+                                    <v>1505951</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11135,7 +11223,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>600712</v>
+                                    <v>600837</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -11155,19 +11243,19 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>9374326</cardinality>
+            <cardinality>9374952</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9367854</v>
+                    <v>9368481</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>9027363</v>
+                    <v>9026372</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1452935</v>
+                    <v>1452936</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -11175,7 +11263,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6259506</v>
+                    <v>6259509</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11189,7 +11277,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9367854</v>
+                                    <v>9368481</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11205,7 +11293,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9361383</v>
+                                    <v>9362010</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11226,7 +11314,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9367854</v>
+                                    <v>9368481</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11242,7 +11330,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9367854</v>
+                                    <v>9368481</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11258,12 +11346,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8704295</v>
+                                    <v>8701686</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>323068</v>
+                                    <v>324686</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11279,7 +11367,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8974348</v>
+                                    <v>8973357</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11300,7 +11388,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8922205</v>
+                                    <v>8921213</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11321,12 +11409,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8783071</v>
+                                    <v>8780711</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>244292</v>
+                                    <v>245661</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11397,7 +11485,7 @@
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>2872</b>
+                                    <b>2870</b>
                                     <v>80891</v>
                                 </b>
                             </bs>
@@ -11505,7 +11593,7 @@
                                 </b>
                                 <b>
                                     <a>25</a>
-                                    <b>27136</b>
+                                    <b>27138</b>
                                     <v>31236</v>
                                 </b>
                             </bs>
@@ -11522,12 +11610,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>475766</v>
+                                    <v>476015</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>164894</v>
+                                    <v>164769</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -11537,7 +11625,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>72180</v>
+                                    <v>72055</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -11630,16 +11718,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5758601</v>
+                                    <v>5758231</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>470788</v>
+                                    <v>471161</v>
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>2940</b>
+                                    <b>2942</b>
                                     <v>30116</v>
                                 </b>
                             </bs>
@@ -11656,12 +11744,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5839244</v>
+                                    <v>5838873</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2935</b>
-                                    <v>420262</v>
+                                    <v>420635</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11677,7 +11765,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5961701</v>
+                                    <v>5961704</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11698,7 +11786,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6247186</v>
+                                    <v>6247189</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11713,11 +11801,11 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3763195</cardinality>
+            <cardinality>3763197</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3763195</v>
+                    <v>3763197</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -11735,11 +11823,11 @@
         </relation>
         <relation>
             <name>var_decl_specifiers</name>
-            <cardinality>488708</cardinality>
+            <cardinality>488709</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>488708</v>
+                    <v>488709</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -11757,7 +11845,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>488708</v>
+                                    <v>488709</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11867,15 +11955,15 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>1629527</cardinality>
+            <cardinality>1629528</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1629527</v>
+                    <v>1629528</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1610611</v>
+                    <v>1610612</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -11893,7 +11981,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1629527</v>
+                                    <v>1629528</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11909,7 +11997,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1629527</v>
+                                    <v>1629528</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11925,7 +12013,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1594308</v>
+                                    <v>1594309</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11967,7 +12055,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1521630</v>
+                                    <v>1521631</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11988,7 +12076,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1521755</v>
+                                    <v>1521756</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12464,19 +12552,19 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>270978</cardinality>
+            <cardinality>271002</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>270978</v>
+                    <v>271002</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>58813</v>
+                    <v>58818</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>26740</v>
+                    <v>26742</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12494,7 +12582,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270978</v>
+                                    <v>271002</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12510,7 +12598,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270978</v>
+                                    <v>271002</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12526,7 +12614,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>270978</v>
+                                    <v>271002</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12542,12 +12630,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51113</v>
+                                    <v>51118</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5364</v>
+                                    <v>5365</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -12568,12 +12656,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51113</v>
+                                    <v>51118</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5364</v>
+                                    <v>5365</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -12594,7 +12682,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58813</v>
+                                    <v>58818</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12610,7 +12698,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21091</v>
+                                    <v>21093</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12641,7 +12729,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21091</v>
+                                    <v>21093</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12672,7 +12760,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26740</v>
+                                    <v>26742</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12745,15 +12833,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>577796</cardinality>
+            <cardinality>577847</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>21806</v>
+                    <v>21808</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>270978</v>
+                    <v>271002</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12797,7 +12885,7 @@
                                 <b>
                                     <a>145</a>
                                     <b>146</b>
-                                    <v>2608</v>
+                                    <v>2609</v>
                                 </b>
                                 <b>
                                     <a>146</a>
@@ -12818,27 +12906,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96210</v>
+                                    <v>96218</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>119794</v>
+                                    <v>119805</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20018</v>
+                                    <v>20020</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>26603</v>
+                                    <v>26605</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>8352</v>
+                                    <v>8353</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12848,15 +12936,15 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>172749</cardinality>
+            <cardinality>172750</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>172749</v>
+                    <v>172750</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>172749</v>
+                    <v>172750</v>
                 </e>
                 <e>
                     <k>message</k>
@@ -12882,7 +12970,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12898,7 +12986,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12914,7 +13002,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12930,7 +13018,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12946,7 +13034,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12962,7 +13050,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12978,7 +13066,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12994,7 +13082,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13456,15 +13544,15 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>7052243</cardinality>
+            <cardinality>7051250</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7011797</v>
+                    <v>7010805</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3400304</v>
+                    <v>3400056</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -13472,7 +13560,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1217354</v>
+                    <v>1217355</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13486,7 +13574,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7011797</v>
+                                    <v>7010805</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13502,7 +13590,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7011797</v>
+                                    <v>7010805</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13518,7 +13606,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6971351</v>
+                                    <v>6970359</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13539,12 +13627,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1470855</v>
+                                    <v>1470856</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>924776</v>
+                                    <v>924652</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13559,7 +13647,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>145977</v>
+                                    <v>145853</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13575,12 +13663,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1470855</v>
+                                    <v>1470856</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>924776</v>
+                                    <v>924652</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13595,7 +13683,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>145977</v>
+                                    <v>145853</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13611,12 +13699,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1778616</v>
+                                    <v>1778617</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1029312</v>
+                                    <v>1029188</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13626,7 +13714,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>11</b>
-                                    <v>154938</v>
+                                    <v>154813</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13660,13 +13748,13 @@
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>322</a>
-                                    <b>15505</b>
+                                    <a>321</a>
+                                    <b>15503</b>
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>27323</a>
-                                    <b>27324</b>
+                                    <a>27321</a>
+                                    <b>27322</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -13701,13 +13789,13 @@
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>322</a>
-                                    <b>15505</b>
+                                    <a>321</a>
+                                    <b>15503</b>
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>27323</a>
-                                    <b>27324</b>
+                                    <a>27321</a>
+                                    <b>27322</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -13801,7 +13889,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>817501</v>
+                                    <v>817502</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13861,7 +13949,7 @@
             <columnsizes>
                 <e>
                     <k>new</k>
-                    <v>150382</v>
+                    <v>150383</v>
                 </e>
                 <e>
                     <k>old</k>
@@ -13935,7 +14023,7 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1502978</cardinality>
+            <cardinality>1502979</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -14111,11 +14199,11 @@
         </relation>
         <relation>
             <name>globalvariables</name>
-            <cardinality>492566</cardinality>
+            <cardinality>492567</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>492566</v>
+                    <v>492567</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -14137,7 +14225,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492566</v>
+                                    <v>492567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14153,7 +14241,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492566</v>
+                                    <v>492567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14297,19 +14385,19 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>724695</cardinality>
+            <cardinality>724674</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>724695</v>
+                    <v>724674</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53298</v>
+                    <v>53296</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>101409</v>
+                    <v>101406</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14323,7 +14411,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724695</v>
+                                    <v>724674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14339,7 +14427,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724695</v>
+                                    <v>724674</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14355,7 +14443,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28789</v>
+                                    <v>28788</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14401,12 +14489,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38248</v>
+                                    <v>38247</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6704</v>
+                                    <v>6703</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14432,7 +14520,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62402</v>
+                                    <v>62400</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14473,12 +14561,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84399</v>
+                                    <v>84396</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8393</v>
+                                    <v>8392</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -16213,15 +16301,15 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3023723</cardinality>
+            <cardinality>3023724</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3023723</v>
+                    <v>3023724</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1457166</v>
+                    <v>1457167</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16243,7 +16331,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3023723</v>
+                                    <v>3023724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16259,7 +16347,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3023723</v>
+                                    <v>3023724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16275,7 +16363,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3023723</v>
+                                    <v>3023724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16291,7 +16379,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1340931</v>
+                                    <v>1340932</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16317,7 +16405,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1457166</v>
+                                    <v>1457167</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16513,7 +16601,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1315917</v>
+                                    <v>1315918</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16544,7 +16632,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1316290</v>
+                                    <v>1316291</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16569,11 +16657,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2242062</cardinality>
+            <cardinality>2242063</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2242062</v>
+                    <v>2242063</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -16595,7 +16683,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2242062</v>
+                                    <v>2242063</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16611,7 +16699,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2242062</v>
+                                    <v>2242063</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17134,15 +17222,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1755743</cardinality>
+            <cardinality>1755899</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1755743</v>
+                    <v>1755899</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>834216</v>
+                    <v>834290</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17156,7 +17244,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1755743</v>
+                                    <v>1755899</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17172,22 +17260,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>659332</v>
+                                    <v>659390</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80757</v>
+                                    <v>80764</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>63915</v>
+                                    <v>63921</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4525</b>
-                                    <v>30211</v>
+                                    <v>30214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17197,7 +17285,7 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>814570</cardinality>
+            <cardinality>814571</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -17205,7 +17293,7 @@
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>814570</v>
+                    <v>814571</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17335,7 +17423,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814570</v>
+                                    <v>814571</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17351,7 +17439,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814570</v>
+                                    <v>814571</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17367,7 +17455,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814570</v>
+                                    <v>814571</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17383,7 +17471,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814570</v>
+                                    <v>814571</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17645,11 +17733,11 @@
         </relation>
         <relation>
             <name>type_operators</name>
-            <cardinality>7937</cardinality>
+            <cardinality>7936</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7937</v>
+                    <v>7936</v>
                 </e>
                 <e>
                     <k>arg_type</k>
@@ -17675,7 +17763,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7937</v>
+                                    <v>7936</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17691,7 +17779,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7937</v>
+                                    <v>7936</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17707,7 +17795,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7937</v>
+                                    <v>7936</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17961,15 +18049,15 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4137505</cardinality>
+            <cardinality>4137871</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4137505</v>
+                    <v>4137871</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>915352</v>
+                    <v>915412</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17987,7 +18075,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4137505</v>
+                                    <v>4137871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18003,7 +18091,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4137505</v>
+                                    <v>4137871</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18019,22 +18107,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>652073</v>
+                                    <v>652110</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>158105</v>
+                                    <v>158098</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>70321</v>
+                                    <v>70349</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>32667</b>
-                                    <v>34850</v>
+                                    <v>34853</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18050,12 +18138,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>863818</v>
+                                    <v>863873</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>51534</v>
+                                    <v>51538</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18190,8 +18278,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>12189</a>
-                                    <b>12190</b>
+                                    <a>12187</a>
+                                    <b>12188</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18207,11 +18295,11 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1359595</cardinality>
+            <cardinality>1359715</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1359595</v>
+                    <v>1359715</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -18233,7 +18321,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359595</v>
+                                    <v>1359715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18249,7 +18337,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359595</v>
+                                    <v>1359715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18507,11 +18595,11 @@
         </relation>
         <relation>
             <name>usertype_alias_kind</name>
-            <cardinality>1755743</cardinality>
+            <cardinality>1755899</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1755743</v>
+                    <v>1755899</v>
                 </e>
                 <e>
                     <k>alias_kind</k>
@@ -18529,7 +18617,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1755743</v>
+                                    <v>1755899</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18560,11 +18648,11 @@
         </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>761283</cardinality>
+            <cardinality>761282</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>761283</v>
+                    <v>761282</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -18644,15 +18732,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>7910439</cardinality>
+            <cardinality>7910194</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7910439</v>
+                    <v>7910194</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6349607</v>
+                    <v>6349610</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -18670,7 +18758,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7910439</v>
+                                    <v>7910194</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18686,7 +18774,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7910439</v>
+                                    <v>7910194</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18702,12 +18790,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6016209</v>
+                                    <v>6016461</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>1120</b>
-                                    <v>333397</v>
+                                    <v>333148</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18723,7 +18811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6349607</v>
+                                    <v>6349610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18742,8 +18830,8 @@
                                     <v>124</v>
                                 </b>
                                 <b>
-                                    <a>63558</a>
-                                    <b>63559</b>
+                                    <a>63556</a>
+                                    <b>63557</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -18775,59 +18863,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>590966</cardinality>
+            <cardinality>590965</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>590966</v>
+                    <v>590965</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1120532</cardinality>
+            <cardinality>1120631</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1120532</v>
+                    <v>1120631</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1341502</cardinality>
+            <cardinality>1341620</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1341502</v>
+                    <v>1341620</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>231183</cardinality>
+            <cardinality>231204</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>231183</v>
+                    <v>231204</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1122152</cardinality>
+            <cardinality>1122283</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1119154</v>
+                    <v>1119253</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>71521</v>
+                    <v>71527</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18841,12 +18929,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1117061</v>
+                                    <v>1117128</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>2093</v>
+                                    <v>2125</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18862,12 +18950,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20386</v>
+                                    <v>20388</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12833</v>
+                                    <v>12834</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18892,17 +18980,17 @@
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>5901</v>
+                                    <v>5891</v>
                                 </b>
                                 <b>
                                     <a>17</a>
-                                    <b>52</b>
-                                    <v>5396</v>
+                                    <b>51</b>
+                                    <v>5365</v>
                                 </b>
                                 <b>
-                                    <a>52</a>
+                                    <a>51</a>
                                     <b>4223</b>
-                                    <v>3513</v>
+                                    <v>3555</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18912,11 +19000,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2887353</cardinality>
+            <cardinality>2887609</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1362193</v>
+                    <v>1362314</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -18924,7 +19012,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>818753</v>
+                    <v>818825</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18938,27 +19026,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>577723</v>
+                                    <v>577774</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408634</v>
+                                    <v>408671</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>249939</v>
+                                    <v>249962</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>102679</v>
+                                    <v>102688</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>113</b>
-                                    <v>23216</v>
+                                    <v>23218</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18974,22 +19062,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>606156</v>
+                                    <v>606210</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>422573</v>
+                                    <v>422610</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>250770</v>
+                                    <v>250793</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>82692</v>
+                                    <v>82699</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19097,22 +19185,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>511556</v>
+                                    <v>511601</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>166889</v>
+                                    <v>166904</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>74918</v>
+                                    <v>74925</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>46</b>
-                                    <v>61412</v>
+                                    <v>61417</v>
                                 </b>
                                 <b>
                                     <a>46</a>
@@ -19133,17 +19221,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>720870</v>
+                                    <v>720934</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79589</v>
+                                    <v>79596</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22</b>
-                                    <v>18293</v>
+                                    <v>18294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19153,7 +19241,7 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>506789</cardinality>
+            <cardinality>506788</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
@@ -19165,7 +19253,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>506653</v>
+                    <v>506652</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19184,7 +19272,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>43087</v>
+                                    <v>43086</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -19348,7 +19436,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506518</v>
+                                    <v>506517</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19369,7 +19457,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506653</v>
+                                    <v>506652</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19379,15 +19467,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>48241</cardinality>
+            <cardinality>48246</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>48241</v>
+                    <v>48246</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>45580</v>
+                    <v>45584</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19401,7 +19489,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>48241</v>
+                                    <v>48246</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19417,7 +19505,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44865</v>
+                                    <v>44869</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19432,11 +19520,11 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>5911106</cardinality>
+            <cardinality>5911109</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5911106</v>
+                    <v>5911109</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -19444,7 +19532,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5854793</v>
+                    <v>5854796</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -19462,7 +19550,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5911106</v>
+                                    <v>5911109</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19478,7 +19566,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5911106</v>
+                                    <v>5911109</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19494,7 +19582,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5911106</v>
+                                    <v>5911109</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19628,7 +19716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5809100</v>
+                                    <v>5809102</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19649,7 +19737,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5809100</v>
+                                    <v>5809102</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19670,7 +19758,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5854793</v>
+                                    <v>5854796</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19728,22 +19816,22 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1328113</cardinality>
+            <cardinality>1328114</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1328113</v>
+                    <v>1328114</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>967580</cardinality>
+            <cardinality>967578</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>967580</v>
+                    <v>967578</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -19761,7 +19849,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>967580</v>
+                                    <v>967578</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19777,7 +19865,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>109833</v>
+                                    <v>109832</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19807,11 +19895,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2468689</cardinality>
+            <cardinality>2468684</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1443873</v>
+                    <v>1443870</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19819,7 +19907,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>296058</v>
+                    <v>296057</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19833,7 +19921,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>777936</v>
+                                    <v>777934</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19864,12 +19952,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>796958</v>
+                                    <v>796956</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408599</v>
+                                    <v>408598</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20083,7 +20171,7 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>449825</cardinality>
+            <cardinality>449824</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
@@ -20095,7 +20183,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>447151</v>
+                    <v>447150</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20288,7 +20376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>444477</v>
+                                    <v>444476</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20309,7 +20397,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>447151</v>
+                                    <v>447150</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20330,11 +20418,11 @@
         </relation>
         <relation>
             <name>variable_instantiation</name>
-            <cardinality>427355</cardinality>
+            <cardinality>427356</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>427355</v>
+                    <v>427356</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -20352,7 +20440,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>427355</v>
+                                    <v>427356</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20449,7 +20537,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>189534</v>
+                                    <v>189535</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20480,7 +20568,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>179827</v>
+                                    <v>179828</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20888,11 +20976,11 @@
         </relation>
         <relation>
             <name>template_template_argument</name>
-            <cardinality>9635</cardinality>
+            <cardinality>9636</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>6090</v>
+                    <v>6091</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20900,7 +20988,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>9046</v>
+                    <v>9047</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20914,7 +21002,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4996</v>
+                                    <v>4997</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20945,7 +21033,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5017</v>
+                                    <v>5018</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21119,7 +21207,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9025</v>
+                                    <v>9026</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21366,11 +21454,11 @@
         </relation>
         <relation>
             <name>concept_instantiation</name>
-            <cardinality>90160</cardinality>
+            <cardinality>90159</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>90160</v>
+                    <v>90159</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -21388,7 +21476,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>90160</v>
+                                    <v>90159</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21484,22 +21572,22 @@
         </relation>
         <relation>
             <name>is_type_constraint</name>
-            <cardinality>36789</cardinality>
+            <cardinality>36788</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>36789</v>
+                    <v>36788</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>concept_template_argument</name>
-            <cardinality>112705</cardinality>
+            <cardinality>112704</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>76152</v>
+                    <v>76151</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -21521,7 +21609,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46335</v>
+                                    <v>46334</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21655,7 +21743,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10361</v>
+                                    <v>10360</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21857,15 +21945,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>600578</cardinality>
+            <cardinality>600577</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>600578</v>
+                    <v>600577</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>282012</v>
+                    <v>282011</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21879,7 +21967,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>600578</v>
+                                    <v>600577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22281,11 +22369,11 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>9677</cardinality>
+            <cardinality>9678</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9677</v>
+                    <v>9678</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -22307,7 +22395,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9677</v>
+                                    <v>9678</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22323,7 +22411,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9677</v>
+                                    <v>9678</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22339,7 +22427,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7731</v>
+                                    <v>7732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22360,7 +22448,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7731</v>
+                                    <v>7732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22598,11 +22686,11 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>9694656</cardinality>
+            <cardinality>9693167</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>4002634</v>
+                    <v>4002387</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -22620,17 +22708,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1526110</v>
+                                    <v>1527356</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>506256</v>
+                                    <v>504514</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1033917</v>
+                                    <v>1034166</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -22734,8 +22822,8 @@
                                     <v>124</v>
                                 </b>
                                 <b>
-                                    <a>15137</a>
-                                    <b>15138</b>
+                                    <a>15135</a>
+                                    <b>15136</b>
                                     <v>124</v>
                                 </b>
                                 <b>
@@ -22744,8 +22832,8 @@
                                     <v>124</v>
                                 </b>
                                 <b>
-                                    <a>22777</a>
-                                    <b>22778</b>
+                                    <a>22767</a>
+                                    <b>22768</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -22756,11 +22844,11 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>3078853</cardinality>
+            <cardinality>3078855</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>2314865</v>
+                    <v>2314866</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -22778,7 +22866,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1654292</v>
+                                    <v>1654293</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23424,7 +23512,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>641033</v>
+                                    <v>641034</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24154,15 +24242,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>71584</cardinality>
+            <cardinality>71632</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>71584</v>
+                    <v>71632</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>71584</v>
+                    <v>71632</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24176,7 +24264,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71584</v>
+                                    <v>71632</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24192,7 +24280,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71584</v>
+                                    <v>71632</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24374,7 +24462,7 @@
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>615272</v>
+                    <v>615273</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24613,15 +24701,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>7228462</cardinality>
+            <cardinality>7228465</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>7228462</v>
+                    <v>7228465</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>3955717</v>
+                    <v>3955719</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24635,7 +24723,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7228462</v>
+                                    <v>7228465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24651,12 +24739,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2475279</v>
+                                    <v>2475280</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1114435</v>
+                                    <v>1114436</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24676,11 +24764,11 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4182338</cardinality>
+            <cardinality>4182091</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>541972</v>
+                    <v>541973</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -24688,7 +24776,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4177733</v>
+                    <v>4177486</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24773,7 +24861,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>83255</v>
+                                    <v>83256</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24966,7 +25054,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4177733</v>
+                                    <v>4177486</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24982,7 +25070,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4173128</v>
+                                    <v>4172881</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24997,15 +25085,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>114976</cardinality>
+            <cardinality>114986</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>114976</v>
+                    <v>114986</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>69091</v>
+                    <v>69097</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25019,7 +25107,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>114976</v>
+                                    <v>114986</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25035,12 +25123,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>37469</v>
+                                    <v>37473</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24478</v>
+                                    <v>24480</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25060,15 +25148,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>473788</cardinality>
+            <cardinality>473787</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>473788</v>
+                    <v>473787</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>452194</v>
+                    <v>452193</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25076,7 +25164,7 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>234017</v>
+                    <v>234016</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -25094,7 +25182,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473788</v>
+                                    <v>473787</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25110,7 +25198,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473788</v>
+                                    <v>473787</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25126,7 +25214,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473788</v>
+                                    <v>473787</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25142,7 +25230,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473788</v>
+                                    <v>473787</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25158,7 +25246,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435778</v>
+                                    <v>435777</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25179,7 +25267,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435778</v>
+                                    <v>435777</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25200,7 +25288,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435778</v>
+                                    <v>435777</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25221,7 +25309,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435778</v>
+                                    <v>435777</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25381,7 +25469,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>224269</v>
+                                    <v>224268</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25402,7 +25490,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>224269</v>
+                                    <v>224268</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25423,7 +25511,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>233577</v>
+                                    <v>233576</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25444,7 +25532,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>228703</v>
+                                    <v>228702</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25578,11 +25666,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>475548</cardinality>
+            <cardinality>475547</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>473348</v>
+                    <v>473347</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -25600,7 +25688,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>471148</v>
+                                    <v>471147</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25646,11 +25734,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>447049</cardinality>
+            <cardinality>447048</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>447049</v>
+                    <v>447048</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -25668,7 +25756,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>447049</v>
+                                    <v>447048</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25865,19 +25953,19 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>767816</cardinality>
+            <cardinality>767814</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>767816</v>
+                    <v>767814</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>54358</v>
+                    <v>54357</v>
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>100626</v>
+                    <v>100728</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -25895,7 +25983,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>767816</v>
+                                    <v>767814</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25911,7 +25999,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>767816</v>
+                                    <v>767814</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25927,7 +26015,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>767816</v>
+                                    <v>767814</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26066,12 +26154,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67287</v>
+                                    <v>67490</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8258</v>
+                                    <v>8157</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26085,13 +26173,13 @@
                                 </b>
                                 <b>
                                     <a>24</a>
-                                    <b>127</b>
-                                    <v>7547</v>
+                                    <b>136</b>
+                                    <v>7649</v>
                                 </b>
                                 <b>
-                                    <a>135</a>
+                                    <a>136</a>
                                     <b>191</b>
-                                    <v>710</v>
+                                    <v>609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26107,12 +26195,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>67287</v>
+                                    <v>67490</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8258</v>
+                                    <v>8157</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26126,13 +26214,13 @@
                                 </b>
                                 <b>
                                     <a>24</a>
-                                    <b>127</b>
-                                    <v>7547</v>
+                                    <b>136</b>
+                                    <v>7649</v>
                                 </b>
                                 <b>
-                                    <a>135</a>
+                                    <a>136</a>
                                     <b>191</b>
-                                    <v>710</v>
+                                    <v>609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26148,7 +26236,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>99408</v>
+                                    <v>99509</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26215,7 +26303,7 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>2841</b>
+                                    <b>2844</b>
                                     <v>338</v>
                                 </b>
                             </bs>
@@ -26226,19 +26314,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>11208571</cardinality>
+            <cardinality>11208576</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11208571</v>
+                    <v>11208576</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>4294963</v>
+                    <v>4294965</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11208571</v>
+                    <v>11208576</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26252,7 +26340,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208571</v>
+                                    <v>11208576</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26268,7 +26356,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208571</v>
+                                    <v>11208576</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26284,7 +26372,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3920498</v>
+                                    <v>3920500</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26310,7 +26398,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3920498</v>
+                                    <v>3920500</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26336,7 +26424,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208571</v>
+                                    <v>11208576</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26352,7 +26440,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208571</v>
+                                    <v>11208576</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26362,15 +26450,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3905315</cardinality>
+            <cardinality>3905317</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3342684</v>
+                    <v>3342686</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3740172</v>
+                    <v>3740174</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26384,7 +26472,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3281207</v>
+                                    <v>3281208</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26405,7 +26493,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3575029</v>
+                                    <v>3575031</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26420,15 +26508,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>9634070</cardinality>
+            <cardinality>9634074</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9633964</v>
+                    <v>9633969</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>9634070</v>
+                    <v>9634074</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26442,7 +26530,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9633859</v>
+                                    <v>9633863</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26463,7 +26551,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9634070</v>
+                                    <v>9634074</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26473,22 +26561,22 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>9923433</cardinality>
+            <cardinality>9923438</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9923433</v>
+                    <v>9923438</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1666648</cardinality>
+            <cardinality>1666623</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>1241201</v>
+                    <v>1241183</v>
                 </e>
                 <e>
                     <k>i</k>
@@ -26496,7 +26584,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1666648</v>
+                    <v>1666623</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26510,12 +26598,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>826180</v>
+                                    <v>826168</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408242</v>
+                                    <v>408236</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26536,12 +26624,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>826180</v>
+                                    <v>826168</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408242</v>
+                                    <v>408236</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26694,7 +26782,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1666648</v>
+                                    <v>1666623</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26710,7 +26798,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1666648</v>
+                                    <v>1666623</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26720,15 +26808,15 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>8615</cardinality>
+            <cardinality>8616</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8615</v>
+                    <v>8616</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>4554</v>
+                    <v>4555</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26742,7 +26830,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8615</v>
+                                    <v>8616</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26758,12 +26846,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3723</v>
+                                    <v>3724</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>525</v>
+                                    <v>526</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26789,7 +26877,7 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2110396</cardinality>
+            <cardinality>2110397</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
@@ -26797,7 +26885,7 @@
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2110396</v>
+                    <v>2110397</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26887,7 +26975,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2110396</v>
+                                    <v>2110397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26897,11 +26985,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19456287</cardinality>
+            <cardinality>19456296</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19456287</v>
+                    <v>19456296</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -26909,7 +26997,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12941374</v>
+                    <v>12941380</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26923,7 +27011,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19456287</v>
+                                    <v>19456296</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26939,7 +27027,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19456287</v>
+                                    <v>19456296</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27057,12 +27145,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7395561</v>
+                                    <v>7395565</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5083213</v>
+                                    <v>5083216</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27083,12 +27171,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7395561</v>
+                                    <v>7395565</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5083213</v>
+                                    <v>5083216</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27103,22 +27191,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6898013</cardinality>
+            <cardinality>6898025</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6898013</v>
+                    <v>6898025</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>6051175</cardinality>
+            <cardinality>6051177</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6051175</v>
+                    <v>6051177</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27136,7 +27224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6051175</v>
+                                    <v>6051177</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27180,8 +27268,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5832065</a>
-                                    <b>5832066</b>
+                                    <a>5832067</a>
+                                    <b>5832068</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -27192,11 +27280,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>5790816</cardinality>
+            <cardinality>5790730</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>5790816</v>
+                    <v>5790730</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27214,7 +27302,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5790816</v>
+                                    <v>5790730</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27376,23 +27464,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>3042586</cardinality>
+            <cardinality>3042541</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3042586</v>
+                    <v>3042541</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>3042586</v>
+                    <v>3042541</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>47729</v>
+                    <v>47728</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>554605</v>
+                    <v>554597</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27406,7 +27494,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042586</v>
+                                    <v>3042541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27422,7 +27510,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042586</v>
+                                    <v>3042541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27438,7 +27526,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042586</v>
+                                    <v>3042541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27454,7 +27542,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042586</v>
+                                    <v>3042541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27470,7 +27558,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042586</v>
+                                    <v>3042541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27486,7 +27574,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3042586</v>
+                                    <v>3042541</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27605,17 +27693,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79413</v>
+                                    <v>79412</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>41015</v>
+                                    <v>41014</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>397795</v>
+                                    <v>397789</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -27636,17 +27724,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79413</v>
+                                    <v>79412</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>41015</v>
+                                    <v>41014</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>397795</v>
+                                    <v>397789</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -27667,7 +27755,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>114958</v>
+                                    <v>114956</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27677,7 +27765,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>414055</v>
+                                    <v>414049</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -27692,11 +27780,11 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>8255498</cardinality>
+            <cardinality>8255502</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>8255498</v>
+                    <v>8255502</v>
                 </e>
                 <e>
                     <k>var</k>
@@ -27714,7 +27802,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8255498</v>
+                                    <v>8255502</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27730,7 +27818,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171553</v>
+                                    <v>171554</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27760,7 +27848,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>80823</v>
+                                    <v>80824</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -27785,15 +27873,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>5806089</cardinality>
+            <cardinality>5806003</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>5803622</v>
+                    <v>5803536</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>275286</v>
+                    <v>275282</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27807,7 +27895,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5801155</v>
+                                    <v>5801069</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27828,12 +27916,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>181071</v>
+                                    <v>181068</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>38312</v>
+                                    <v>38311</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27848,7 +27936,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>37798</b>
-                                    <v>16067</v>
+                                    <v>16066</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27984,11 +28072,11 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>53478</cardinality>
+            <cardinality>53477</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>53478</v>
+                    <v>53477</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -28010,7 +28098,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53478</v>
+                                    <v>53477</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28026,7 +28114,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53478</v>
+                                    <v>53477</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28131,15 +28219,15 @@
         </relation>
         <relation>
             <name>expr_cond_guard</name>
-            <cardinality>897971</cardinality>
+            <cardinality>897972</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>897971</v>
+                    <v>897972</v>
                 </e>
                 <e>
                     <k>guard</k>
-                    <v>897971</v>
+                    <v>897972</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28153,7 +28241,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897971</v>
+                                    <v>897972</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28169,7 +28257,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897971</v>
+                                    <v>897972</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28179,15 +28267,15 @@
         </relation>
         <relation>
             <name>expr_cond_true</name>
-            <cardinality>897967</cardinality>
+            <cardinality>897968</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>897967</v>
+                    <v>897968</v>
                 </e>
                 <e>
                     <k>true</k>
-                    <v>897967</v>
+                    <v>897968</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28201,7 +28289,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897967</v>
+                                    <v>897968</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28217,7 +28305,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897967</v>
+                                    <v>897968</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28227,15 +28315,15 @@
         </relation>
         <relation>
             <name>expr_cond_false</name>
-            <cardinality>897971</cardinality>
+            <cardinality>897972</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>897971</v>
+                    <v>897972</v>
                 </e>
                 <e>
                     <k>false</k>
-                    <v>897971</v>
+                    <v>897972</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28249,7 +28337,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897971</v>
+                                    <v>897972</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28265,7 +28353,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897971</v>
+                                    <v>897972</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28275,11 +28363,11 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>13541557</cardinality>
+            <cardinality>13541563</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13541557</v>
+                    <v>13541563</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -28297,7 +28385,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13541557</v>
+                                    <v>13541563</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28343,11 +28431,11 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>6637698</cardinality>
+            <cardinality>6637568</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6637698</v>
+                    <v>6637568</v>
                 </e>
                 <e>
                     <k>text</k>
@@ -28365,7 +28453,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6637698</v>
+                                    <v>6637568</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28395,7 +28483,7 @@
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>593717</b>
+                                    <b>593723</b>
                                     <v>27872</v>
                                 </b>
                             </bs>
@@ -28406,15 +28494,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>13649707</cardinality>
+            <cardinality>13649714</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>13541557</v>
+                    <v>13541563</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>13649707</v>
+                    <v>13649714</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28428,7 +28516,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13451399</v>
+                                    <v>13451406</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28449,7 +28537,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13649707</v>
+                                    <v>13649714</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28851,23 +28939,23 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>2244826</cardinality>
+            <cardinality>2244830</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>2244826</v>
+                    <v>2244830</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>978848</v>
+                    <v>978850</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>2244826</v>
+                    <v>2244830</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>515723</v>
+                    <v>515724</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28881,7 +28969,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244826</v>
+                                    <v>2244830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28897,7 +28985,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244826</v>
+                                    <v>2244830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28913,7 +29001,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244826</v>
+                                    <v>2244830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28929,7 +29017,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>868819</v>
+                                    <v>868820</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28955,7 +29043,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>868819</v>
+                                    <v>868820</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28981,7 +29069,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>978840</v>
+                                    <v>978842</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29002,7 +29090,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244826</v>
+                                    <v>2244830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29018,7 +29106,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244826</v>
+                                    <v>2244830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29034,7 +29122,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244826</v>
+                                    <v>2244830</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29050,7 +29138,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414196</v>
+                                    <v>414197</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29081,7 +29169,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>443422</v>
+                                    <v>443423</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29107,7 +29195,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414196</v>
+                                    <v>414197</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29143,15 +29231,15 @@
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>1672611</cardinality>
+            <cardinality>1672586</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>1672611</v>
+                    <v>1672586</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>837120</v>
+                    <v>837108</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29165,7 +29253,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1672611</v>
+                                    <v>1672586</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29186,7 +29274,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>810049</v>
+                                    <v>810037</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -29201,11 +29289,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25213250</cardinality>
+            <cardinality>25213262</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25213250</v>
+                    <v>25213262</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -29213,7 +29301,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>10586806</v>
+                    <v>10586811</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29227,7 +29315,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213250</v>
+                                    <v>25213262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29243,7 +29331,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213250</v>
+                                    <v>25213262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29421,7 +29509,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8904640</v>
+                                    <v>8904644</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29452,7 +29540,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9044058</v>
+                                    <v>9044063</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29462,7 +29550,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>32</b>
-                                    <v>768383</v>
+                                    <v>768384</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29472,15 +29560,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>844478</cardinality>
+            <cardinality>844466</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>844478</v>
+                    <v>844466</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>844478</v>
+                    <v>844466</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -29498,7 +29586,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>844478</v>
+                                    <v>844466</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29514,7 +29602,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>844478</v>
+                                    <v>844466</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29530,7 +29618,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>844478</v>
+                                    <v>844466</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29546,7 +29634,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>844478</v>
+                                    <v>844466</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29598,11 +29686,11 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25213250</cardinality>
+            <cardinality>25213262</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25213250</v>
+                    <v>25213262</v>
                 </e>
                 <e>
                     <k>typeid</k>
@@ -29624,7 +29712,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213250</v>
+                                    <v>25213262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29640,7 +29728,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213250</v>
+                                    <v>25213262</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29906,11 +29994,11 @@
         </relation>
         <relation>
             <name>param_ref_to_this</name>
-            <cardinality>24952</cardinality>
+            <cardinality>24951</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>24952</v>
+                    <v>24951</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -31253,15 +31341,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>407684</cardinality>
+            <cardinality>407678</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>407684</v>
+                    <v>407678</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>407684</v>
+                    <v>407678</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31275,7 +31363,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407684</v>
+                                    <v>407678</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31291,7 +31379,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407684</v>
+                                    <v>407678</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33133,11 +33221,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>6349654</cardinality>
+            <cardinality>6349665</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6349654</v>
+                    <v>6349665</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -33145,7 +33233,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2676166</v>
+                    <v>2676171</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33159,7 +33247,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6349654</v>
+                                    <v>6349665</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33175,7 +33263,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6349654</v>
+                                    <v>6349665</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33413,7 +33501,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2218094</v>
+                                    <v>2218098</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33444,7 +33532,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2593460</v>
+                                    <v>2593464</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33614,15 +33702,15 @@
         </relation>
         <relation>
             <name>if_then</name>
-            <cardinality>990318</cardinality>
+            <cardinality>990319</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>990318</v>
+                    <v>990319</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>990318</v>
+                    <v>990319</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33636,7 +33724,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>990318</v>
+                                    <v>990319</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33652,7 +33740,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>990318</v>
+                                    <v>990319</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33662,15 +33750,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>435785</cardinality>
+            <cardinality>435779</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>435785</v>
+                    <v>435779</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>435785</v>
+                    <v>435779</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33684,7 +33772,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435785</v>
+                                    <v>435779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33700,7 +33788,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435785</v>
+                                    <v>435779</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34094,11 +34182,11 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>833624</cardinality>
+            <cardinality>833612</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>410623</v>
+                    <v>410617</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -34106,7 +34194,7 @@
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>833624</v>
+                    <v>833612</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34125,12 +34213,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>407748</v>
+                                    <v>407742</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>2853</v>
+                                    <v>2852</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34151,12 +34239,12 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>407748</v>
+                                    <v>407742</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>2853</v>
+                                    <v>2852</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34314,7 +34402,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>833624</v>
+                                    <v>833612</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34330,7 +34418,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>833624</v>
+                                    <v>833612</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34340,15 +34428,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>410623</cardinality>
+            <cardinality>410617</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>410623</v>
+                    <v>410617</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>410623</v>
+                    <v>410617</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34362,7 +34450,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>410623</v>
+                                    <v>410617</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34378,7 +34466,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>410623</v>
+                                    <v>410617</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34580,11 +34668,11 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>5611093</cardinality>
+            <cardinality>5611103</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5611093</v>
+                    <v>5611103</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -34592,7 +34680,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2374340</v>
+                    <v>2374344</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34606,7 +34694,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5611093</v>
+                                    <v>5611103</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34622,7 +34710,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5611093</v>
+                                    <v>5611103</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34760,22 +34848,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1355057</v>
+                                    <v>1355059</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>515763</v>
+                                    <v>515764</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>151046</v>
+                                    <v>151047</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>155241</v>
+                                    <v>155242</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -34801,22 +34889,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1355057</v>
+                                    <v>1355059</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>515763</v>
+                                    <v>515764</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>151046</v>
+                                    <v>151047</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>155241</v>
+                                    <v>155242</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -34847,11 +34935,11 @@
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>723619</cardinality>
+            <cardinality>723620</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>713083</v>
+                    <v>713084</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -34859,7 +34947,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>723619</v>
+                    <v>723620</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34873,7 +34961,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>705641</v>
+                                    <v>705642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34894,7 +34982,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>705641</v>
+                                    <v>705642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35027,7 +35115,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723619</v>
+                                    <v>723620</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35043,7 +35131,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723619</v>
+                                    <v>723620</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35053,11 +35141,11 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>723619</cardinality>
+            <cardinality>723620</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>713083</v>
+                    <v>713084</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -35065,7 +35153,7 @@
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>723619</v>
+                    <v>723620</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35079,7 +35167,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>705641</v>
+                                    <v>705642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35100,7 +35188,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>705641</v>
+                                    <v>705642</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35233,7 +35321,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723619</v>
+                                    <v>723620</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35249,7 +35337,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723619</v>
+                                    <v>723620</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35259,15 +35347,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1640354</cardinality>
+            <cardinality>1640355</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1640354</v>
+                    <v>1640355</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1423689</v>
+                    <v>1423690</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35281,7 +35369,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1640354</v>
+                                    <v>1640355</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35498,11 +35586,11 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5395212</cardinality>
+            <cardinality>5395214</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5395212</v>
+                    <v>5395214</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -35510,7 +35598,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5392101</v>
+                    <v>5392103</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35524,7 +35612,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5395212</v>
+                                    <v>5395214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35540,7 +35628,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5395212</v>
+                                    <v>5395214</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35688,7 +35776,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5391976</v>
+                                    <v>5391979</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -35709,7 +35797,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5392101</v>
+                                    <v>5392103</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35741,7 +35829,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>648002</v>
+                                    <v>648003</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35777,11 +35865,11 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>438182</cardinality>
+            <cardinality>438183</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>438182</v>
+                    <v>438183</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -35799,19 +35887,19 @@
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>4341756</cardinality>
+            <cardinality>4341758</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4341756</v>
+                    <v>4341758</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2947934</v>
+                    <v>2947935</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1679306</v>
+                    <v>1679307</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35825,7 +35913,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4341756</v>
+                                    <v>4341758</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35841,7 +35929,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4341756</v>
+                                    <v>4341758</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35857,7 +35945,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2749812</v>
+                                    <v>2749813</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35878,7 +35966,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2866918</v>
+                                    <v>2866919</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35925,7 +36013,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1535693</v>
+                                    <v>1535694</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35945,15 +36033,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>317337</cardinality>
+            <cardinality>317365</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>317337</v>
+                    <v>317365</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>58456</v>
+                    <v>58461</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35967,7 +36055,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>317337</v>
+                                    <v>317365</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35983,17 +36071,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28928</v>
+                                    <v>28930</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9404</v>
+                                    <v>9405</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4933</v>
+                                    <v>4934</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -36119,11 +36207,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>30224787</cardinality>
+            <cardinality>30224721</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3843719</v>
+                    <v>3843710</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -36141,7 +36229,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>527063</v>
+                                    <v>527062</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36151,7 +36239,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3289882</v>
+                                    <v>3289875</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/cpp/ql/lib/upgrades/9439176c1d1312787926458dd54d65a849069118/old.dbscheme b/cpp/ql/lib/upgrades/9439176c1d1312787926458dd54d65a849069118/old.dbscheme
new file mode 100644
index 000000000000..9439176c1d13
--- /dev/null
+++ b/cpp/ql/lib/upgrades/9439176c1d1312787926458dd54d65a849069118/old.dbscheme
@@ -0,0 +1,2489 @@
+
+/*- 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
+)
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/9439176c1d1312787926458dd54d65a849069118/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/9439176c1d1312787926458dd54d65a849069118/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..7e7c2f55670f
--- /dev/null
+++ b/cpp/ql/lib/upgrades/9439176c1d1312787926458dd54d65a849069118/semmlecode.cpp.dbscheme
@@ -0,0 +1,2517 @@
+
+/*- 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
+);
+
+/**
+ * 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(
+    string source_file: string ref,
+    int trap_file: @trap ref
+);
+
+/**
+ * Holds if there is a definition of `element` in TRAP file `trap_file`.
+ */
+in_trap(
+    int element: @element ref,
+    int trap_file: @trap ref
+);
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 17 = @ppd_embed
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+embeds(
+    unique int id: @ppd_embed ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- Database metadata -*/
+
+/**
+ * The CLI will automatically emit applicable tuples for this table,
+ * such as `databaseMetadata("isOverlay", "true")` when building an
+ * overlay database.
+ */
+databaseMetadata(
+  string metadataKey: string ref,
+  string value: string ref
+);
+
+/*- Overlay support -*/
+
+/**
+ * The CLI will automatically emit tuples for each new/modified/deleted file
+ * when building an overlay database.
+ */
+overlayChangedFiles(
+  string path: string ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/9439176c1d1312787926458dd54d65a849069118/upgrade.properties b/cpp/ql/lib/upgrades/9439176c1d1312787926458dd54d65a849069118/upgrade.properties
new file mode 100644
index 000000000000..a50cc3b23134
--- /dev/null
+++ b/cpp/ql/lib/upgrades/9439176c1d1312787926458dd54d65a849069118/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add trap_filename, source_file_uses_trap and in_trap relations
+compatibility: full