diff --git a/cpp/downgrades/a42ce5fc943254097f85471b94ae2247e819104a/old.dbscheme b/cpp/downgrades/a42ce5fc943254097f85471b94ae2247e819104a/old.dbscheme
new file mode 100644
index 000000000000..a42ce5fc9432
--- /dev/null
+++ b/cpp/downgrades/a42ce5fc943254097f85471b94ae2247e819104a/old.dbscheme
@@ -0,0 +1,2469 @@
+
+/*- 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             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @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
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/**
+ * 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
+);
+
+/**
+ * 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/a42ce5fc943254097f85471b94ae2247e819104a/semmlecode.dbscheme b/cpp/downgrades/a42ce5fc943254097f85471b94ae2247e819104a/semmlecode.dbscheme
new file mode 100644
index 000000000000..1a6854060d5d
--- /dev/null
+++ b/cpp/downgrades/a42ce5fc943254097f85471b94ae2247e819104a/semmlecode.dbscheme
@@ -0,0 +1,2450 @@
+/*- 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             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @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
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/downgrades/a42ce5fc943254097f85471b94ae2247e819104a/upgrade.properties b/cpp/downgrades/a42ce5fc943254097f85471b94ae2247e819104a/upgrade.properties
new file mode 100644
index 000000000000..1a7cdb0ad716
--- /dev/null
+++ b/cpp/downgrades/a42ce5fc943254097f85471b94ae2247e819104a/upgrade.properties
@@ -0,0 +1,4 @@
+description: Add databaseMetadata and overlayChangedFiles relations
+compatibility: full
+databaseMetadata.rel: delete
+overlayChangedFiles.rel: delete
diff --git a/cpp/ql/lib/qlpack.yml b/cpp/ql/lib/qlpack.yml
index febb297cb8da..5c2083a86133 100644
--- a/cpp/ql/lib/qlpack.yml
+++ b/cpp/ql/lib/qlpack.yml
@@ -21,3 +21,4 @@ dataExtensions:
   - ext/deallocation/*.model.yml
   - ext/allocation/*.model.yml
 warnOnImplicitThis: true
+compileForOverlayEval: true
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index 1a6854060d5d..a42ce5fc9432 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -1,3 +1,4 @@
+
 /*- Compilations -*/
 
 /**
@@ -2378,6 +2379,24 @@ link_parent(
     int link_target : @link_target ref
 );
 
+/**
+ * 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
+);
+
+/**
+ * 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(
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 1d796c9aa9ad..4ff7d2dd67b5 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>12640</v>
+            <v>12641</v>
         </e>
         <e>
             <k>@externalDataElement</k>
@@ -10,35 +10,35 @@
         </e>
         <e>
             <k>@file</k>
-            <v>65198</v>
+            <v>65204</v>
         </e>
         <e>
             <k>@folder</k>
-            <v>12387</v>
+            <v>12388</v>
         </e>
         <e>
             <k>@diagnostic</k>
             <v>359</v>
         </e>
-        <e>
-            <k>@location_default</k>
-            <v>46943795</v>
-        </e>
         <e>
             <k>@pch</k>
             <v>249</v>
         </e>
+        <e>
+            <k>@location_default</k>
+            <v>46943825</v>
+        </e>
         <e>
             <k>@macro_expansion</k>
-            <v>40272403</v>
+            <v>40272429</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
-            <v>300697</v>
+            <v>300698</v>
         </e>
         <e>
             <k>@normal_function</k>
-            <v>2737947</v>
+            <v>2737949</v>
         </e>
         <e>
             <k>@unknown_function</k>
@@ -46,7 +46,7 @@
         </e>
         <e>
             <k>@constructor</k>
-            <v>698677</v>
+            <v>698692</v>
         </e>
         <e>
             <k>@destructor</k>
@@ -58,7 +58,7 @@
         </e>
         <e>
             <k>@operator</k>
-            <v>652426</v>
+            <v>652427</v>
         </e>
         <e>
             <k>@user_defined_literal</k>
@@ -70,23 +70,23 @@
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4202851</v>
+            <v>4202854</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>9383095</v>
+            <v>9383101</v>
         </e>
         <e>
             <k>@type_decl</k>
-            <v>1633437</v>
+            <v>1633438</v>
         </e>
         <e>
             <k>@namespace_decl</k>
-            <v>407917</v>
+            <v>407918</v>
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>267880</v>
+            <v>268041</v>
         </e>
         <e>
             <k>@using_directive</k>
@@ -102,11 +102,11 @@
         </e>
         <e>
             <k>@parameter</k>
-            <v>7019638</v>
+            <v>7019643</v>
         </e>
         <e>
             <k>@membervariable</k>
-            <v>1499493</v>
+            <v>1499494</v>
         </e>
         <e>
             <k>@globalvariable</k>
@@ -114,7 +114,7 @@
         </e>
         <e>
             <k>@localvariable</k>
-            <v>725806</v>
+            <v>726016</v>
         </e>
         <e>
             <k>@enumconstant</k>
@@ -378,7 +378,7 @@
         </e>
         <e>
             <k>@routineptr</k>
-            <v>684266</v>
+            <v>684282</v>
         </e>
         <e>
             <k>@reference</k>
@@ -404,6 +404,10 @@
             <k>@scalable_vector</k>
             <v>1</v>
         </e>
+        <e>
+            <k>@decltype</k>
+            <v>102350</v>
+        </e>
         <e>
             <k>@typeof</k>
             <v>816</v>
@@ -484,13 +488,9 @@
             <k>@remove_reference</k>
             <v>5715</v>
         </e>
-        <e>
-            <k>@decltype</k>
-            <v>102350</v>
-        </e>
         <e>
             <k>@struct</k>
-            <v>979711</v>
+            <v>979799</v>
         </e>
         <e>
             <k>@union</k>
@@ -502,11 +502,11 @@
         </e>
         <e>
             <k>@template_parameter</k>
-            <v>866907</v>
+            <v>866985</v>
         </e>
         <e>
             <k>@alias</k>
-            <v>1762011</v>
+            <v>1762169</v>
         </e>
         <e>
             <k>@unknown_usertype</k>
@@ -514,7 +514,7 @@
         </e>
         <e>
             <k>@class</k>
-            <v>324965</v>
+            <v>324966</v>
         </e>
         <e>
             <k>@template_template_parameter</k>
@@ -522,7 +522,7 @@
         </e>
         <e>
             <k>@proxy_class</k>
-            <v>48429</v>
+            <v>48433</v>
         </e>
         <e>
             <k>@scoped_enum</k>
@@ -530,7 +530,7 @@
         </e>
         <e>
             <k>@template_struct</k>
-            <v>212038</v>
+            <v>212057</v>
         </e>
         <e>
             <k>@template_class</k>
@@ -542,23 +542,23 @@
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6364342</v>
+            <v>6364346</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>5907627</v>
+            <v>5907630</v>
         </e>
         <e>
             <k>@concept_template</k>
-            <v>3610</v>
+            <v>3609</v>
         </e>
         <e>
             <k>@routinetype</k>
-            <v>604482</v>
+            <v>604495</v>
         </e>
         <e>
             <k>@ptrtomember</k>
-            <v>9725</v>
+            <v>9726</v>
         </e>
         <e>
             <k>@specifier</k>
@@ -582,15 +582,15 @@
         </e>
         <e>
             <k>@alignas</k>
-            <v>2163</v>
+            <v>2164</v>
         </e>
         <e>
             <k>@attribute_arg_token</k>
-            <v>16692</v>
+            <v>16693</v>
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>71883</v>
+            <v>71889</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
@@ -606,23 +606,23 @@
         </e>
         <e>
             <k>@attribute_arg_type</k>
-            <v>459</v>
+            <v>460</v>
         </e>
         <e>
             <k>@derivation</k>
-            <v>476867</v>
+            <v>476878</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>699835</v>
+            <v>700430</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>11233093</v>
+            <v>11233100</v>
         </e>
         <e>
             <k>@namespace</k>
-            <v>8648</v>
+            <v>8649</v>
         </e>
         <e>
             <k>@specialnamequalifyingelement</k>
@@ -630,15 +630,15 @@
         </e>
         <e>
             <k>@namequalifier</k>
-            <v>3037999</v>
+            <v>3037638</v>
         </e>
         <e>
             <k>@value</k>
-            <v>13474763</v>
+            <v>13474772</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>2247635</v>
+            <v>2247637</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -650,19 +650,19 @@
         </e>
         <e>
             <k>@array_to_pointer</k>
-            <v>1953766</v>
+            <v>1953767</v>
         </e>
         <e>
             <k>@parexpr</k>
-            <v>4915246</v>
+            <v>4915249</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
-            <v>586538</v>
+            <v>586539</v>
         </e>
         <e>
             <k>@unaryplusexpr</k>
-            <v>4067</v>
+            <v>4068</v>
         </e>
         <e>
             <k>@complementexpr</k>
@@ -694,11 +694,11 @@
         </e>
         <e>
             <k>@addexpr</k>
-            <v>571559</v>
+            <v>571560</v>
         </e>
         <e>
             <k>@subexpr</k>
-            <v>466802</v>
+            <v>466803</v>
         </e>
         <e>
             <k>@mulexpr</k>
@@ -734,11 +734,11 @@
         </e>
         <e>
             <k>@andexpr</k>
-            <v>481223</v>
+            <v>481224</v>
         </e>
         <e>
             <k>@orexpr</k>
-            <v>194057</v>
+            <v>194058</v>
         </e>
         <e>
             <k>@xorexpr</k>
@@ -746,11 +746,11 @@
         </e>
         <e>
             <k>@eqexpr</k>
-            <v>643379</v>
+            <v>643380</v>
         </e>
         <e>
             <k>@neexpr</k>
-            <v>411873</v>
+            <v>411874</v>
         </e>
         <e>
             <k>@gtexpr</k>
@@ -770,7 +770,7 @@
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>1281159</v>
+            <v>1281160</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -782,7 +782,7 @@
         </e>
         <e>
             <k>@assignmulexpr</k>
-            <v>11183</v>
+            <v>11184</v>
         </e>
         <e>
             <k>@assigndivexpr</k>
@@ -838,7 +838,7 @@
         </e>
         <e>
             <k>@callexpr</k>
-            <v>239762</v>
+            <v>239767</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -858,7 +858,7 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>8254728</v>
+            <v>8254733</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
@@ -866,7 +866,7 @@
         </e>
         <e>
             <k>@runtime_alignof</k>
-            <v>49873</v>
+            <v>49874</v>
         </e>
         <e>
             <k>@expr_stmt</k>
@@ -874,11 +874,11 @@
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>5730574</v>
+            <v>5729912</v>
         </e>
         <e>
             <k>@type_operand</k>
-            <v>1405379</v>
+            <v>1405380</v>
         </e>
         <e>
             <k>@offsetofexpr</k>
@@ -886,11 +886,11 @@
         </e>
         <e>
             <k>@typescompexpr</k>
-            <v>701942</v>
+            <v>701943</v>
         </e>
         <e>
             <k>@literal</k>
-            <v>7966636</v>
+            <v>7966268</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -898,23 +898,23 @@
         </e>
         <e>
             <k>@c_style_cast</k>
-            <v>6026984</v>
+            <v>6026987</v>
         </e>
         <e>
             <k>@temp_init</k>
-            <v>991871</v>
+            <v>990622</v>
         </e>
         <e>
             <k>@errorexpr</k>
-            <v>45479</v>
+            <v>45480</v>
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1902179</v>
+            <v>1903214</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2107171</v>
+            <v>2107218</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
@@ -974,11 +974,11 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1555763</v>
+            <v>1555764</v>
         </e>
         <e>
             <k>@new_expr</k>
-            <v>46194</v>
+            <v>46195</v>
         </e>
         <e>
             <k>@delete_expr</k>
@@ -986,19 +986,19 @@
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>24145</v>
+            <v>24214</v>
         </e>
         <e>
             <k>@condition_decl</k>
-            <v>408385</v>
+            <v>408340</v>
         </e>
         <e>
             <k>@braced_init_list</k>
-            <v>2151</v>
+            <v>2146</v>
         </e>
         <e>
             <k>@type_id</k>
-            <v>47898</v>
+            <v>47899</v>
         </e>
         <e>
             <k>@sizeof_pack</k>
@@ -1106,7 +1106,7 @@
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>112829</v>
+            <v>112831</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
@@ -1122,7 +1122,7 @@
         </e>
         <e>
             <k>@dtordirectdestruct</k>
-            <v>39449</v>
+            <v>39450</v>
         </e>
         <e>
             <k>@dtorvirtualdestruct</k>
@@ -1130,7 +1130,7 @@
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>39824</v>
+            <v>39825</v>
         </e>
         <e>
             <k>@static_cast</k>
@@ -1154,11 +1154,11 @@
         </e>
         <e>
             <k>@param_ref</k>
-            <v>163939</v>
+            <v>163867</v>
         </e>
         <e>
             <k>@noopexpr</k>
-            <v>64</v>
+            <v>48</v>
         </e>
         <e>
             <k>@istriviallyconstructibleexpr</k>
@@ -1186,7 +1186,7 @@
         </e>
         <e>
             <k>@istrivialexpr</k>
-            <v>3367</v>
+            <v>3375</v>
         </e>
         <e>
             <k>@isstandardlayoutexpr</k>
@@ -1258,7 +1258,7 @@
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>28343</v>
+            <v>28463</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1322,7 +1322,7 @@
         </e>
         <e>
             <k>@issame</k>
-            <v>4534</v>
+            <v>4533</v>
         </e>
         <e>
             <k>@isfunction</k>
@@ -1430,7 +1430,7 @@
         </e>
         <e>
             <k>@reuseexpr</k>
-            <v>845931</v>
+            <v>845836</v>
         </e>
         <e>
             <k>@istriviallycopyassignable</k>
@@ -1530,7 +1530,7 @@
         </e>
         <e>
             <k>@requires_expr</k>
-            <v>16481</v>
+            <v>16479</v>
         </e>
         <e>
             <k>@nested_requirement</k>
@@ -1538,11 +1538,11 @@
         </e>
         <e>
             <k>@compound_requirement</k>
-            <v>10937</v>
+            <v>10936</v>
         </e>
         <e>
             <k>@concept_id</k>
-            <v>90315</v>
+            <v>90305</v>
         </e>
         <e>
             <k>@lambdacapture</k>
@@ -1550,11 +1550,11 @@
         </e>
         <e>
             <k>@stmt_expr</k>
-            <v>2031638</v>
+            <v>2031639</v>
         </e>
         <e>
             <k>@stmt_if</k>
-            <v>990226</v>
+            <v>990227</v>
         </e>
         <e>
             <k>@stmt_while</k>
@@ -1562,23 +1562,23 @@
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>157874</v>
+            <v>157889</v>
         </e>
         <e>
             <k>@stmt_label</k>
-            <v>78008</v>
+            <v>78015</v>
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1241721</v>
+            <v>1241800</v>
         </e>
         <e>
             <k>@stmt_block</k>
-            <v>1728619</v>
+            <v>1728620</v>
         </e>
         <e>
             <k>@stmt_end_test_while</k>
-            <v>233643</v>
+            <v>233644</v>
         </e>
         <e>
             <k>@stmt_for</k>
@@ -1586,11 +1586,11 @@
         </e>
         <e>
             <k>@stmt_switch_case</k>
-            <v>835058</v>
+            <v>834964</v>
         </e>
         <e>
             <k>@stmt_switch</k>
-            <v>411329</v>
+            <v>411283</v>
         </e>
         <e>
             <k>@stmt_asm</k>
@@ -1598,11 +1598,11 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>771065</v>
+            <v>771066</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>428842</v>
+            <v>428794</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1614,7 +1614,7 @@
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>26736</v>
+            <v>26771</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
@@ -1634,15 +1634,15 @@
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>6384</v>
+            <v>6372</v>
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>43770</v>
+            <v>43779</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
-            <v>106034</v>
+            <v>106035</v>
         </e>
         <e>
             <k>@stmt_co_return</k>
@@ -1670,11 +1670,11 @@
         </e>
         <e>
             <k>@ppd_ifndef</k>
-            <v>160377</v>
+            <v>160378</v>
         </e>
         <e>
             <k>@ppd_elif</k>
-            <v>21912</v>
+            <v>21914</v>
         </e>
         <e>
             <k>@ppd_else</k>
@@ -1686,11 +1686,11 @@
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>318495</v>
+            <v>318524</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2750047</v>
+            <v>2750049</v>
         </e>
         <e>
             <k>@ppd_undef</k>
@@ -1706,7 +1706,7 @@
         </e>
         <e>
             <k>@ppd_line</k>
-            <v>18799</v>
+            <v>18805</v>
         </e>
         <e>
             <k>@ppd_error</k>
@@ -1762,13 +1762,60 @@
         </e>
     </typesizes>
     <stats>
+        <relation>
+            <name>databaseMetadata</name>
+            <cardinality>1</cardinality>
+            <columnsizes>
+                <e>
+                    <k>metadataKey</k>
+                    <v>1</v>
+                </e>
+                <e>
+                    <k>value</k>
+                    <v>1</v>
+                </e>
+            </columnsizes>
+            <dependencies>
+                <dep>
+                    <src>metadataKey</src>
+                    <trg>value</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs/>
+                        </hist>
+                    </val>
+                </dep>
+                <dep>
+                    <src>value</src>
+                    <trg>metadataKey</trg>
+                    <val>
+                        <hist>
+                            <budget>12</budget>
+                            <bs/>
+                        </hist>
+                    </val>
+                </dep>
+            </dependencies>
+        </relation>
+        <relation>
+            <name>overlayChangedFiles</name>
+            <cardinality>50</cardinality>
+            <columnsizes>
+                <e>
+                    <k>path</k>
+                    <v>50</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
         <relation>
             <name>compilations</name>
-            <cardinality>12640</cardinality>
+            <cardinality>12641</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12640</v>
+                    <v>12641</v>
                 </e>
                 <e>
                     <k>cwd</k>
@@ -1786,7 +1833,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12640</v>
+                                    <v>12641</v>
                                 </b>
                             </bs>
                         </hist>
@@ -1812,11 +1859,11 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1011994</cardinality>
+            <cardinality>1012084</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12640</v>
+                    <v>12641</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -1824,7 +1871,7 @@
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29262</v>
+                    <v>29264</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -1893,7 +1940,7 @@
                                 <b>
                                     <a>103</a>
                                     <b>104</b>
-                                    <v>1995</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>104</a>
@@ -1984,7 +2031,7 @@
                                 <b>
                                     <a>79</a>
                                     <b>89</b>
-                                    <v>1129</v>
+                                    <v>1130</v>
                                 </b>
                                 <b>
                                     <a>89</a>
@@ -2152,12 +2199,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13400</v>
+                                    <v>13402</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12682</v>
+                                    <v>12683</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2183,12 +2230,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19377</v>
+                                    <v>19379</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8722</v>
+                                    <v>8723</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2203,11 +2250,11 @@
         </relation>
         <relation>
             <name>compilation_expanded_args</name>
-            <cardinality>1011994</cardinality>
+            <cardinality>1012084</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12640</v>
+                    <v>12641</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -2215,7 +2262,7 @@
                 </e>
                 <e>
                     <k>arg</k>
-                    <v>29262</v>
+                    <v>29264</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2284,7 +2331,7 @@
                                 <b>
                                     <a>103</a>
                                     <b>104</b>
-                                    <v>1995</v>
+                                    <v>1996</v>
                                 </b>
                                 <b>
                                     <a>104</a>
@@ -2375,7 +2422,7 @@
                                 <b>
                                     <a>79</a>
                                     <b>89</b>
-                                    <v>1129</v>
+                                    <v>1130</v>
                                 </b>
                                 <b>
                                     <a>89</a>
@@ -2543,12 +2590,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13400</v>
+                                    <v>13402</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12682</v>
+                                    <v>12683</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2574,12 +2621,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19377</v>
+                                    <v>19379</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8722</v>
+                                    <v>8723</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -2904,7 +2951,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>14485</v>
+                    <v>18352</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2985,27 +3032,27 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>544</v>
+                                    <v>653</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>816</v>
+                                    <v>707</v>
                                 </b>
                                 <b>
                                     <a>6</a>
-                                    <b>7</b>
-                                    <v>163</v>
+                                    <b>9</b>
+                                    <v>217</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
+                                    <a>9</a>
                                     <b>10</b>
-                                    <v>217</v>
+                                    <v>108</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>108</v>
+                                    <v>163</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -3013,20 +3060,25 @@
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>18</b>
-                                    <v>217</v>
+                                    <a>15</a>
+                                    <b>17</b>
+                                    <v>163</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>22</b>
+                                    <a>17</a>
+                                    <b>21</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>25</a>
-                                    <b>98</b>
+                                    <a>21</a>
+                                    <b>51</b>
                                     <v>217</v>
                                 </b>
+                                <b>
+                                    <a>118</a>
+                                    <b>119</b>
+                                    <v>54</v>
+                                </b>
                             </bs>
                         </hist>
                     </val>
@@ -3098,12 +3150,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1089</v>
+                                    <v>1252</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>1306</v>
+                                    <v>1089</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -3113,32 +3165,32 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>599</v>
+                                    <v>544</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>217</v>
+                                    <v>272</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>217</v>
+                                    <v>326</v>
                                 </b>
                                 <b>
                                     <a>9</a>
-                                    <b>13</b>
+                                    <b>17</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>17</a>
-                                    <b>46</b>
+                                    <a>23</a>
+                                    <b>53</b>
                                     <v>381</v>
                                 </b>
                                 <b>
-                                    <a>50</a>
-                                    <b>90</b>
-                                    <v>108</v>
+                                    <a>98</a>
+                                    <b>99</b>
+                                    <v>54</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3186,16 +3238,21 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>108</v>
+                                    <v>54</v>
                                 </b>
                                 <b>
-                                    <a>154</a>
-                                    <b>155</b>
+                                    <a>5</a>
+                                    <b>6</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>171</a>
-                                    <b>172</b>
+                                    <a>195</a>
+                                    <b>196</b>
+                                    <v>54</v>
+                                </b>
+                                <b>
+                                    <a>197</a>
+                                    <b>198</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -3212,22 +3269,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7732</v>
+                                    <v>12198</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3376</v>
+                                    <v>4084</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>2341</v>
+                                    <v>1415</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>46</b>
-                                    <v>1034</v>
+                                    <b>44</b>
+                                    <v>653</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3243,27 +3300,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7242</v>
+                                    <v>10891</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3158</v>
+                                    <v>4465</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1960</v>
+                                    <v>1579</v>
                                 </b>
                                 <b>
                                     <a>4</a>
-                                    <b>6</b>
-                                    <v>1306</v>
-                                </b>
-                                <b>
-                                    <a>6</a>
-                                    <b>77</b>
-                                    <v>816</v>
+                                    <b>71</b>
+                                    <v>1415</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3279,12 +3331,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10837</v>
+                                    <v>14866</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3648</v>
+                                    <v>3485</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3560,19 +3612,19 @@
         </relation>
         <relation>
             <name>compilation_finished</name>
-            <cardinality>12640</cardinality>
+            <cardinality>12641</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12640</v>
+                    <v>12641</v>
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>9630</v>
+                    <v>9409</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
-                    <v>221</v>
+                    <v>200</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -3586,7 +3638,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12640</v>
+                                    <v>12641</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3602,7 +3654,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12640</v>
+                                    <v>12641</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3618,17 +3670,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8268</v>
+                                    <v>7846</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1013</v>
+                                    <v>1130</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>37</b>
-                                    <v>348</v>
+                                    <b>35</b>
+                                    <v>433</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3644,12 +3696,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8923</v>
+                                    <v>8744</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>707</v>
+                                    <v>665</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3665,12 +3717,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>63</v>
+                                    <v>42</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>21</v>
+                                    <v>10</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -3678,14 +3735,19 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
                                     <v>10</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>21</v>
+                                    <v>10</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -3693,43 +3755,43 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
+                                    <a>14</a>
+                                    <b>15</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>21</b>
+                                    <a>19</a>
+                                    <b>20</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>29</a>
-                                    <b>30</b>
+                                    <a>32</a>
+                                    <b>33</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>59</a>
-                                    <b>60</b>
+                                    <a>57</a>
+                                    <b>58</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>150</a>
-                                    <b>151</b>
+                                    <a>154</a>
+                                    <b>155</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>247</a>
-                                    <b>248</b>
+                                    <a>251</a>
+                                    <b>252</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>302</a>
-                                    <b>303</b>
+                                    <a>306</a>
+                                    <b>307</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>319</a>
-                                    <b>320</b>
+                                    <a>309</a>
+                                    <b>310</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -3746,12 +3808,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>63</v>
+                                    <v>42</v>
+                                </b>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>21</v>
+                                    <v>10</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -3759,14 +3826,19 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
-                                    <b>9</b>
+                                    <a>9</a>
+                                    <b>10</b>
+                                    <v>10</v>
+                                </b>
+                                <b>
+                                    <a>10</a>
+                                    <b>11</b>
                                     <v>10</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>12</b>
-                                    <v>21</v>
+                                    <v>10</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -3774,13 +3846,13 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>13</a>
-                                    <b>14</b>
+                                    <a>14</a>
+                                    <b>15</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>20</a>
-                                    <b>21</b>
+                                    <a>18</a>
+                                    <b>19</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -3789,28 +3861,28 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>59</a>
-                                    <b>60</b>
+                                    <a>54</a>
+                                    <b>55</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>148</a>
-                                    <b>149</b>
+                                    <a>149</a>
+                                    <b>150</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>159</a>
-                                    <b>160</b>
+                                    <a>152</a>
+                                    <b>153</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>237</a>
-                                    <b>238</b>
+                                    <a>228</a>
+                                    <b>229</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>256</a>
-                                    <b>257</b>
+                                    <a>255</a>
+                                    <b>256</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -4048,11 +4120,11 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>46943795</cardinality>
+            <cardinality>46943825</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>46943795</v>
+                    <v>46943825</v>
                 </e>
                 <e>
                     <k>file</k>
@@ -4060,7 +4132,7 @@
                 </e>
                 <e>
                     <k>beginLine</k>
-                    <v>7500413</v>
+                    <v>7500418</v>
                 </e>
                 <e>
                     <k>beginColumn</k>
@@ -4068,7 +4140,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>7501536</v>
+                    <v>7501541</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -4086,7 +4158,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46943795</v>
+                                    <v>46943825</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4102,7 +4174,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46943795</v>
+                                    <v>46943825</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4118,7 +4190,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46943795</v>
+                                    <v>46943825</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4134,7 +4206,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46943795</v>
+                                    <v>46943825</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4150,7 +4222,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46943795</v>
+                                    <v>46943825</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4551,7 +4623,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4957321</v>
+                                    <v>4957324</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -4561,7 +4633,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>543896</v>
+                                    <v>543897</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -4592,7 +4664,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5019320</v>
+                                    <v>5019323</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -4607,7 +4679,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>57</b>
-                                    <v>563232</v>
+                                    <v>563233</v>
                                 </b>
                                 <b>
                                     <a>57</a>
@@ -4628,7 +4700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5641184</v>
+                                    <v>5641187</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -4643,7 +4715,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>565228</v>
+                                    <v>565229</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -4664,12 +4736,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7034358</v>
+                                    <v>7034363</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>85</b>
-                                    <v>466054</v>
+                                    <v>466055</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4685,7 +4757,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5026306</v>
+                                    <v>5026309</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -4700,12 +4772,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>12</b>
-                                    <v>586934</v>
+                                    <v>586935</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>72</b>
-                                    <v>564105</v>
+                                    <v>564106</v>
                                 </b>
                                 <b>
                                     <a>72</a>
@@ -5106,12 +5178,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4955200</v>
+                                    <v>4955203</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>781539</v>
+                                    <v>781540</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -5147,7 +5219,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5016451</v>
+                                    <v>5016454</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5162,7 +5234,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>52</b>
-                                    <v>564105</v>
+                                    <v>564106</v>
                                 </b>
                                 <b>
                                     <a>52</a>
@@ -5183,7 +5255,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7051449</v>
+                                    <v>7051453</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5204,7 +5276,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5640311</v>
+                                    <v>5640314</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5240,17 +5312,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5024934</v>
+                                    <v>5024937</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>743741</v>
+                                    <v>743742</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>539530</v>
+                                    <v>539531</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -5260,7 +5332,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>72</b>
-                                    <v>562733</v>
+                                    <v>562734</v>
                                 </b>
                                 <b>
                                     <a>72</a>
@@ -5580,15 +5652,15 @@
         </relation>
         <relation>
             <name>files</name>
-            <cardinality>65198</cardinality>
+            <cardinality>65204</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>65198</v>
+                    <v>65204</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>65198</v>
+                    <v>65204</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5602,7 +5674,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65198</v>
+                                    <v>65204</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5618,7 +5690,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>65198</v>
+                                    <v>65204</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5628,15 +5700,15 @@
         </relation>
         <relation>
             <name>folders</name>
-            <cardinality>12387</cardinality>
+            <cardinality>12388</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>12387</v>
+                    <v>12388</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>12387</v>
+                    <v>12388</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5650,7 +5722,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12387</v>
+                                    <v>12388</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5666,7 +5738,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12387</v>
+                                    <v>12388</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5676,15 +5748,15 @@
         </relation>
         <relation>
             <name>containerparent</name>
-            <cardinality>77564</cardinality>
+            <cardinality>77571</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>12387</v>
+                    <v>12388</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>77564</v>
+                    <v>77571</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -5698,7 +5770,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6029</v>
+                                    <v>6030</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5749,7 +5821,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77564</v>
+                                    <v>77571</v>
                                 </b>
                             </bs>
                         </hist>
@@ -5759,11 +5831,11 @@
         </relation>
         <relation>
             <name>numlines</name>
-            <cardinality>807861</cardinality>
+            <cardinality>807862</cardinality>
             <columnsizes>
                 <e>
                     <k>element_id</k>
-                    <v>806738</v>
+                    <v>806739</v>
                 </e>
                 <e>
                     <k>num_lines</k>
@@ -7237,11 +7309,11 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>4199643</cardinality>
+            <cardinality>4200019</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5765</v>
+                    <v>5766</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -7249,11 +7321,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>58704</v>
+                    <v>58709</v>
                 </e>
                 <e>
                     <k>value</k>
-                    <v>39505</v>
+                    <v>39509</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7288,12 +7360,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>86</b>
-                                    <v>432</v>
+                                    <v>433</v>
                                 </b>
                                 <b>
                                     <a>88</a>
                                     <b>206</b>
-                                    <v>432</v>
+                                    <v>433</v>
                                 </b>
                                 <b>
                                     <a>212</a>
@@ -7303,17 +7375,17 @@
                                 <b>
                                     <a>291</a>
                                     <b>359</b>
-                                    <v>432</v>
+                                    <v>433</v>
                                 </b>
                                 <b>
                                     <a>362</a>
                                     <b>401</b>
-                                    <v>432</v>
+                                    <v>433</v>
                                 </b>
                                 <b>
                                     <a>402</a>
                                     <b>479</b>
-                                    <v>432</v>
+                                    <v>433</v>
                                 </b>
                                 <b>
                                     <a>480</a>
@@ -7328,7 +7400,7 @@
                                 <b>
                                     <a>553</a>
                                     <b>628</b>
-                                    <v>432</v>
+                                    <v>433</v>
                                 </b>
                                 <b>
                                     <a>631</a>
@@ -7359,17 +7431,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>98</b>
-                                    <v>432</v>
+                                    <v>433</v>
                                 </b>
                                 <b>
                                     <a>102</a>
                                     <b>244</b>
-                                    <v>432</v>
+                                    <v>433</v>
                                 </b>
                                 <b>
                                     <a>244</a>
                                     <b>351</b>
-                                    <v>432</v>
+                                    <v>433</v>
                                 </b>
                                 <b>
                                     <a>352</a>
@@ -7384,7 +7456,7 @@
                                 <b>
                                     <a>490</a>
                                     <b>628</b>
-                                    <v>432</v>
+                                    <v>433</v>
                                 </b>
                                 <b>
                                     <a>632</a>
@@ -7399,22 +7471,22 @@
                                 <b>
                                     <a>710</a>
                                     <b>939</b>
-                                    <v>432</v>
+                                    <v>433</v>
                                 </b>
                                 <b>
                                     <a>939</a>
                                     <b>1038</b>
-                                    <v>432</v>
+                                    <v>433</v>
                                 </b>
                                 <b>
                                     <a>1066</a>
                                     <b>1853</b>
-                                    <v>432</v>
+                                    <v>433</v>
                                 </b>
                                 <b>
                                     <a>1853</a>
                                     <b>3292</b>
-                                    <v>432</v>
+                                    <v>433</v>
                                 </b>
                                 <b>
                                     <a>3423</a>
@@ -7498,7 +7570,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11024</v>
+                                    <v>11025</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7518,12 +7590,12 @@
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>4593</v>
+                                    <v>4594</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>16</b>
-                                    <v>4329</v>
+                                    <v>4330</v>
                                 </b>
                                 <b>
                                     <a>16</a>
@@ -7533,12 +7605,12 @@
                                 <b>
                                     <a>19</a>
                                     <b>27</b>
-                                    <v>4255</v>
+                                    <v>4256</v>
                                 </b>
                                 <b>
                                     <a>27</a>
                                     <b>47</b>
-                                    <v>4836</v>
+                                    <v>4837</v>
                                 </b>
                                 <b>
                                     <a>47</a>
@@ -7569,7 +7641,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58704</v>
+                                    <v>58709</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7585,12 +7657,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11584</v>
+                                    <v>11585</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7687</v>
+                                    <v>7688</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7600,7 +7672,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4065</v>
+                                    <v>4066</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -7630,7 +7702,7 @@
                                 <b>
                                     <a>41</a>
                                     <b>95</b>
-                                    <v>4466</v>
+                                    <v>4467</v>
                                 </b>
                                 <b>
                                     <a>95</a>
@@ -7691,12 +7763,12 @@
                                 <b>
                                     <a>51</a>
                                     <b>58</b>
-                                    <v>3030</v>
+                                    <v>3031</v>
                                 </b>
                                 <b>
                                     <a>58</a>
                                     <b>80</b>
-                                    <v>2977</v>
+                                    <v>2978</v>
                                 </b>
                                 <b>
                                     <a>81</a>
@@ -7706,7 +7778,7 @@
                                 <b>
                                     <a>151</a>
                                     <b>334</b>
-                                    <v>2977</v>
+                                    <v>2978</v>
                                 </b>
                                 <b>
                                     <a>334</a>
@@ -7732,7 +7804,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39495</v>
+                                    <v>39498</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7763,7 +7835,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3051</v>
+                                    <v>3052</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -7773,7 +7845,7 @@
                                 <b>
                                     <a>8</a>
                                     <b>14</b>
-                                    <v>3484</v>
+                                    <v>3485</v>
                                 </b>
                                 <b>
                                     <a>14</a>
@@ -7783,17 +7855,17 @@
                                 <b>
                                     <a>18</a>
                                     <b>28</b>
-                                    <v>3199</v>
+                                    <v>3200</v>
                                 </b>
                                 <b>
                                     <a>28</a>
                                     <b>34</b>
-                                    <v>3146</v>
+                                    <v>3147</v>
                                 </b>
                                 <b>
                                     <a>34</a>
                                     <b>41</b>
-                                    <v>3199</v>
+                                    <v>3200</v>
                                 </b>
                                 <b>
                                     <a>41</a>
@@ -7813,7 +7885,7 @@
                                 <b>
                                     <a>113</a>
                                     <b>145</b>
-                                    <v>3030</v>
+                                    <v>3031</v>
                                 </b>
                                 <b>
                                     <a>145</a>
@@ -7828,15 +7900,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>149997201</cardinality>
+            <cardinality>149997296</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24671160</v>
+                    <v>24671176</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3705370</v>
+                    <v>3705372</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7850,37 +7922,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>2209511</v>
+                                    <v>2209512</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1474989</v>
+                                    <v>1474990</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>1620381</v>
+                                    <v>1620382</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>6582595</v>
+                                    <v>6582599</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>8719067</v>
+                                    <v>8719073</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>3557076</v>
+                                    <v>3557078</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>22</b>
-                                    <v>507538</v>
+                                    <v>507539</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7901,7 +7973,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>743238</v>
+                                    <v>743239</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7931,12 +8003,12 @@
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>444653</v>
+                                    <v>444654</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>307800</v>
+                                    <v>307801</v>
                                 </b>
                                 <b>
                                     <a>339</a>
@@ -7956,15 +8028,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48736214</cardinality>
+            <cardinality>48736245</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7044796</v>
+                    <v>7044800</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3803150</v>
+                    <v>3803153</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7978,12 +8050,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3846740</v>
+                                    <v>3846743</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>766310</v>
+                                    <v>766311</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7993,7 +8065,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>772742</v>
+                                    <v>772743</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -8003,7 +8075,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>50</b>
-                                    <v>556271</v>
+                                    <v>556272</v>
                                 </b>
                                 <b>
                                     <a>50</a>
@@ -8054,7 +8126,7 @@
                                 <b>
                                     <a>14</a>
                                     <b>15</b>
-                                    <v>408041</v>
+                                    <v>408042</v>
                                 </b>
                                 <b>
                                     <a>15</a>
@@ -8064,7 +8136,7 @@
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>377680</v>
+                                    <v>377681</v>
                                 </b>
                                 <b>
                                     <a>17</a>
@@ -8094,11 +8166,11 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>40354035</cardinality>
+            <cardinality>40354061</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>40354035</v>
+                    <v>40354061</v>
                 </e>
                 <e>
                     <k>macro_id</k>
@@ -8106,7 +8178,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5919825</v>
+                    <v>5919829</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -8124,7 +8196,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40354035</v>
+                                    <v>40354061</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8140,7 +8212,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40354035</v>
+                                    <v>40354061</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8156,7 +8228,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40354035</v>
+                                    <v>40354061</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8279,7 +8351,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>177858</v>
+                                    <v>177859</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8300,12 +8372,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5256857</v>
+                                    <v>5256860</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>428527</v>
+                                    <v>428528</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -8326,7 +8398,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5897661</v>
+                                    <v>5897665</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8347,7 +8419,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5919825</v>
+                                    <v>5919829</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8420,15 +8492,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>33658296</cardinality>
+            <cardinality>33658318</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33658296</v>
+                    <v>33658318</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>15929098</v>
+                    <v>15929108</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8442,7 +8514,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33658296</v>
+                                    <v>33658318</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8458,17 +8530,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7809235</v>
+                                    <v>7809240</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1595502</v>
+                                    <v>1595503</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4703022</v>
+                                    <v>4703025</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -8488,15 +8560,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>6032778</cardinality>
+            <cardinality>6033959</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4216419</v>
+                    <v>4217710</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2276207</v>
+                    <v>2276069</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8510,12 +8582,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3291436</v>
+                                    <v>3292783</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>490596</v>
+                                    <v>490566</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8525,12 +8597,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>413328</v>
+                                    <v>413303</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>17</b>
-                                    <v>13171</v>
+                                    <v>13170</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8546,12 +8618,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1335195</v>
+                                    <v>1335114</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>481486</v>
+                                    <v>481456</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8561,12 +8633,12 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>427639</v>
+                                    <v>427613</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>522</b>
-                                    <v>24087</v>
+                                    <v>24085</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8576,19 +8648,19 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>82481176</cardinality>
+            <cardinality>82486758</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26280397</v>
+                    <v>26280952</v>
                 </e>
                 <e>
                     <k>argument_index</k>
-                    <v>696</v>
+                    <v>697</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>343195</v>
+                    <v>343226</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8602,22 +8674,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9681115</v>
+                                    <v>9680186</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9768522</v>
+                                    <v>9769396</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5001183</v>
+                                    <v>5001631</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1829575</v>
+                                    <v>1829739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8633,22 +8705,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9863712</v>
+                                    <v>9862798</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9786062</v>
+                                    <v>9786938</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4844554</v>
+                                    <v>4844988</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1786067</v>
+                                    <v>1786227</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8673,7 +8745,7 @@
                                 </b>
                                 <b>
                                     <a>646840</a>
-                                    <b>2488628</b>
+                                    <b>2488458</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -8716,52 +8788,52 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39695</v>
+                                    <v>39699</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>62315</v>
+                                    <v>62321</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>21025</v>
+                                    <v>21027</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>34574</v>
+                                    <v>34577</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>39241</v>
+                                    <v>39245</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>9</b>
-                                    <v>30867</v>
+                                    <v>30870</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>15</b>
-                                    <v>28977</v>
+                                    <v>28979</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>26</b>
-                                    <v>25883</v>
+                                    <v>25885</v>
                                 </b>
                                 <b>
                                     <a>26</a>
                                     <b>57</b>
-                                    <v>27139</v>
+                                    <v>27142</v>
                                 </b>
                                 <b>
                                     <a>57</a>
                                     <b>517</b>
-                                    <v>25988</v>
+                                    <v>25990</v>
                                 </b>
                                 <b>
                                     <a>518</a>
@@ -8782,17 +8854,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>243127</v>
+                                    <v>243149</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>89856</v>
+                                    <v>89864</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>9</b>
-                                    <v>10211</v>
+                                    <v>10212</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8802,19 +8874,19 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>82481176</cardinality>
+            <cardinality>82486758</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26280397</v>
+                    <v>26280952</v>
                 </e>
                 <e>
                     <k>argument_index</k>
-                    <v>696</v>
+                    <v>697</v>
                 </e>
                 <e>
                     <k>text</k>
-                    <v>207888</v>
+                    <v>207906</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8828,22 +8900,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9681115</v>
+                                    <v>9680186</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9768522</v>
+                                    <v>9769396</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>5001183</v>
+                                    <v>5001631</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1829575</v>
+                                    <v>1829739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8859,22 +8931,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12639154</v>
+                                    <v>12638489</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8426648</v>
+                                    <v>8427402</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4224417</v>
+                                    <v>4224795</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>990177</v>
+                                    <v>990265</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8899,7 +8971,7 @@
                                 </b>
                                 <b>
                                     <a>646840</a>
-                                    <b>2488628</b>
+                                    <b>2488458</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -8942,22 +9014,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21827</v>
+                                    <v>21829</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26854</v>
+                                    <v>26856</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>43486</v>
+                                    <v>43490</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>15903</v>
+                                    <v>15905</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -8967,32 +9039,32 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>18395</v>
+                                    <v>18397</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>18966</v>
+                                    <v>18967</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>18321</v>
+                                    <v>18323</v>
                                 </b>
                                 <b>
                                     <a>19</a>
                                     <b>51</b>
-                                    <v>15776</v>
+                                    <v>15778</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>252</b>
-                                    <v>15597</v>
+                                    <v>15598</v>
                                 </b>
                                 <b>
                                     <a>252</a>
-                                    <b>1169531</b>
-                                    <v>9493</v>
+                                    <b>1169361</b>
+                                    <v>9494</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9008,17 +9080,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>105063</v>
+                                    <v>105072</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>88895</v>
+                                    <v>88903</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>66</b>
-                                    <v>13928</v>
+                                    <v>13930</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9028,15 +9100,15 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4049287</cardinality>
+            <cardinality>4049290</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4049287</v>
+                    <v>4049290</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1693315</v>
+                    <v>1693316</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -9054,7 +9126,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4049287</v>
+                                    <v>4049290</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9070,7 +9142,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4049287</v>
+                                    <v>4049290</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9112,7 +9184,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1690446</v>
+                                    <v>1690447</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9219,26 +9291,26 @@
         </relation>
         <relation>
             <name>builtin_functions</name>
-            <cardinality>30920</cardinality>
+            <cardinality>30923</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>30920</v>
+                    <v>30923</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1141750</cardinality>
+            <cardinality>1141776</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1138003</v>
+                    <v>1138028</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1141750</v>
+                    <v>1141776</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9252,7 +9324,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1134801</v>
+                                    <v>1134826</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9273,7 +9345,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1141750</v>
+                                    <v>1141776</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9283,11 +9355,11 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4066752</cardinality>
+            <cardinality>4066754</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4049287</v>
+                    <v>4049290</v>
                 </e>
                 <e>
                     <k>return_type</k>
@@ -9305,7 +9377,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4031823</v>
+                                    <v>4031825</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9637,33 +9709,33 @@
         </relation>
         <relation>
             <name>function_deleted</name>
-            <cardinality>87973</cardinality>
+            <cardinality>87963</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>87973</v>
+                    <v>87963</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_defaulted</name>
-            <cardinality>51614</cardinality>
+            <cardinality>51609</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>51614</v>
+                    <v>51609</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>4047790</cardinality>
+            <cardinality>4047793</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4047790</v>
+                    <v>4047793</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -9743,11 +9815,11 @@
         </relation>
         <relation>
             <name>member_function_this_type</name>
-            <cardinality>674132</cardinality>
+            <cardinality>674133</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>674132</v>
+                    <v>674133</v>
                 </e>
                 <e>
                     <k>this_type</k>
@@ -9765,7 +9837,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>674132</v>
+                                    <v>674133</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9821,15 +9893,15 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4208839</cardinality>
+            <cardinality>4208841</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4202851</v>
+                    <v>4202854</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4024712</v>
+                    <v>4024715</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -9837,11 +9909,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1691818</v>
+                    <v>1691819</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2813169</v>
+                    <v>2813171</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9855,7 +9927,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4202851</v>
+                                    <v>4202854</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9871,7 +9943,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4196863</v>
+                                    <v>4196866</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9892,7 +9964,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4202851</v>
+                                    <v>4202854</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9908,7 +9980,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4202851</v>
+                                    <v>4202854</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9924,7 +9996,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3861169</v>
+                                    <v>3861171</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9945,7 +10017,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4006250</v>
+                                    <v>4006252</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9966,7 +10038,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4024712</v>
+                                    <v>4024715</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9982,7 +10054,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3881627</v>
+                                    <v>3881630</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10039,7 +10111,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>305255</v>
+                                    <v>305256</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10194,7 +10266,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1602001</v>
+                                    <v>1602002</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10215,7 +10287,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1367227</v>
+                                    <v>1367228</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10241,12 +10313,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2420216</v>
+                                    <v>2420218</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>251489</v>
+                                    <v>251490</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10267,12 +10339,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2438928</v>
+                                    <v>2438930</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>233276</v>
+                                    <v>233277</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10293,7 +10365,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2698776</v>
+                                    <v>2698778</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10314,7 +10386,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2773999</v>
+                                    <v>2774000</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10329,11 +10401,11 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1422240</cardinality>
+            <cardinality>1422241</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1422240</v>
+                    <v>1422241</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -10362,11 +10434,11 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>4279570</cardinality>
+            <cardinality>4279573</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1748204</v>
+                    <v>1748205</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -10394,7 +10466,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1100143</v>
+                                    <v>1100144</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -10607,15 +10679,15 @@
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>141820</cardinality>
+            <cardinality>141823</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>141820</v>
+                    <v>141823</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>141343</v>
+                    <v>141346</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10629,7 +10701,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>141820</v>
+                                    <v>141823</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10645,7 +10717,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>140900</v>
+                                    <v>140903</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10671,15 +10743,15 @@
         </relation>
         <relation>
             <name>fun_decl_typedef_type</name>
-            <cardinality>2759</cardinality>
+            <cardinality>2760</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>2759</v>
+                    <v>2760</v>
                 </e>
                 <e>
                     <k>typedeftype_id</k>
-                    <v>123</v>
+                    <v>124</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10693,7 +10765,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2759</v>
+                                    <v>2760</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10709,57 +10781,57 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39</v>
+                                    <v>40</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>11</v>
+                                    <v>12</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>11</v>
+                                    <v>12</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>13</b>
-                                    <v>7</v>
+                                    <v>8</v>
                                 </b>
                                 <b>
                                     <a>16</a>
                                     <b>17</b>
-                                    <v>11</v>
+                                    <v>12</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>3</v>
+                                    <v>4</v>
                                 </b>
                                 <b>
                                     <a>21</a>
                                     <b>22</b>
-                                    <v>7</v>
+                                    <v>8</v>
                                 </b>
                                 <b>
                                     <a>25</a>
                                     <b>43</b>
-                                    <v>7</v>
+                                    <v>8</v>
                                 </b>
                                 <b>
                                     <a>46</a>
                                     <b>55</b>
-                                    <v>7</v>
+                                    <v>8</v>
                                 </b>
                                 <b>
                                     <a>89</a>
                                     <b>128</b>
-                                    <v>7</v>
+                                    <v>8</v>
                                 </b>
                                 <b>
                                     <a>158</a>
                                     <b>159</b>
-                                    <v>3</v>
+                                    <v>4</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10769,11 +10841,11 @@
         </relation>
         <relation>
             <name>fun_requires</name>
-            <cardinality>29073</cardinality>
+            <cardinality>29070</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>10099</v>
+                    <v>10098</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -10781,7 +10853,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>28837</v>
+                    <v>28834</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10795,7 +10867,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10035</v>
+                                    <v>10033</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10816,7 +10888,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7263</v>
+                                    <v>7262</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10899,7 +10971,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28600</v>
+                                    <v>28597</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10920,7 +10992,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28837</v>
+                                    <v>28834</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10930,11 +11002,11 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7310174</cardinality>
+            <cardinality>7310179</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7310174</v>
+                    <v>7310179</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -10942,7 +11014,7 @@
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3531587</v>
+                    <v>3531589</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10956,7 +11028,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7310174</v>
+                                    <v>7310179</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10972,7 +11044,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7310174</v>
+                                    <v>7310179</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11070,7 +11142,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1508939</v>
+                                    <v>1508940</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11106,7 +11178,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1508939</v>
+                                    <v>1508940</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11136,19 +11208,19 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>9389956</cardinality>
+            <cardinality>9389962</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9383095</v>
+                    <v>9383101</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>9034677</v>
+                    <v>9034682</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1456421</v>
+                    <v>1456422</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -11156,7 +11228,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6274400</v>
+                    <v>6274404</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11170,7 +11242,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9383095</v>
+                                    <v>9383101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11186,7 +11258,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9376234</v>
+                                    <v>9376240</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11207,7 +11279,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9383095</v>
+                                    <v>9383101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11223,7 +11295,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9383095</v>
+                                    <v>9383101</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11239,12 +11311,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8703723</v>
+                                    <v>8703728</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>330953</v>
+                                    <v>330954</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11260,7 +11332,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8981160</v>
+                                    <v>8981166</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11281,7 +11353,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8929265</v>
+                                    <v>8929271</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11302,7 +11374,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8783062</v>
+                                    <v>8783068</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11328,7 +11400,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>284048</v>
+                                    <v>284049</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -11395,7 +11467,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1119479</v>
+                                    <v>1119480</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11426,7 +11498,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>985376</v>
+                                    <v>985377</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11482,7 +11554,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>64119</v>
+                                    <v>64120</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -11503,7 +11575,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>478903</v>
+                                    <v>478904</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11611,7 +11683,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5774663</v>
+                                    <v>5774667</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11637,7 +11709,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5855499</v>
+                                    <v>5855503</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11658,7 +11730,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5975880</v>
+                                    <v>5975884</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11679,7 +11751,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6262050</v>
+                                    <v>6262054</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11694,11 +11766,11 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3766860</cardinality>
+            <cardinality>3766862</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3766860</v>
+                    <v>3766862</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -11848,19 +11920,19 @@
         </relation>
         <relation>
             <name>type_decls</name>
-            <cardinality>1633437</cardinality>
+            <cardinality>1633438</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1633437</v>
+                    <v>1633438</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1614475</v>
+                    <v>1614476</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1547361</v>
+                    <v>1547362</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11874,7 +11946,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1633437</v>
+                                    <v>1633438</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11890,7 +11962,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1633437</v>
+                                    <v>1633438</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11906,7 +11978,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1598133</v>
+                                    <v>1598134</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11927,7 +11999,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1598258</v>
+                                    <v>1598259</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11948,7 +12020,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1525281</v>
+                                    <v>1525282</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11969,7 +12041,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1525406</v>
+                                    <v>1525407</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11995,18 +12067,18 @@
         </relation>
         <relation>
             <name>type_decl_top</name>
-            <cardinality>675275</cardinality>
+            <cardinality>675276</cardinality>
             <columnsizes>
                 <e>
                     <k>type_decl</k>
-                    <v>675275</v>
+                    <v>675276</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_requires</name>
-            <cardinality>7671</cardinality>
+            <cardinality>7670</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -12014,7 +12086,7 @@
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>7649</v>
+                    <v>7648</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12064,7 +12136,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7628</v>
+                                    <v>7627</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12079,11 +12151,11 @@
         </relation>
         <relation>
             <name>namespace_decls</name>
-            <cardinality>407917</cardinality>
+            <cardinality>407918</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>407917</v>
+                    <v>407918</v>
                 </e>
                 <e>
                     <k>namespace_id</k>
@@ -12091,11 +12163,11 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>407917</v>
+                    <v>407918</v>
                 </e>
                 <e>
                     <k>bodylocation</k>
-                    <v>407917</v>
+                    <v>407918</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12109,7 +12181,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407917</v>
+                                    <v>407918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12125,7 +12197,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407917</v>
+                                    <v>407918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12141,7 +12213,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407917</v>
+                                    <v>407918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12355,7 +12427,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407917</v>
+                                    <v>407918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12371,7 +12443,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407917</v>
+                                    <v>407918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12387,7 +12459,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407917</v>
+                                    <v>407918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12403,7 +12475,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407917</v>
+                                    <v>407918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12419,7 +12491,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407917</v>
+                                    <v>407918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12435,7 +12507,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>407917</v>
+                                    <v>407918</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12445,19 +12517,19 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>272030</cardinality>
+            <cardinality>272192</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>272030</v>
+                    <v>272192</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>59042</v>
+                    <v>59184</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>26844</v>
+                    <v>26846</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -12475,7 +12547,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>272030</v>
+                                    <v>272192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12491,7 +12563,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>272030</v>
+                                    <v>272192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12507,7 +12579,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>272030</v>
+                                    <v>272192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12523,12 +12595,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51312</v>
+                                    <v>51453</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5385</v>
+                                    <v>5386</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -12549,12 +12621,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51312</v>
+                                    <v>51453</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>5385</v>
+                                    <v>5386</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -12575,7 +12647,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>59042</v>
+                                    <v>59184</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12591,21 +12663,21 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21173</v>
+                                    <v>21175</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2302</v>
+                                    <v>2291</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1943</v>
+                                    <v>1953</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>367</b>
+                                    <b>371</b>
                                     <v>1425</v>
                                 </b>
                             </bs>
@@ -12622,21 +12694,21 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>21173</v>
+                                    <v>21175</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2302</v>
+                                    <v>2291</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1943</v>
+                                    <v>1953</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>367</b>
+                                    <b>371</b>
                                     <v>1425</v>
                                 </b>
                             </bs>
@@ -12653,7 +12725,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>26844</v>
+                                    <v>26846</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12672,8 +12744,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>25367</a>
-                                    <b>25368</b>
+                                    <a>25380</a>
+                                    <b>25381</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -12693,8 +12765,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>5377</a>
-                                    <b>5378</b>
+                                    <a>5390</a>
+                                    <b>5391</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -12726,15 +12798,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>580040</cardinality>
+            <cardinality>580229</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>21891</v>
+                    <v>21914</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>272030</v>
+                    <v>272192</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12748,7 +12820,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10370</v>
+                                    <v>10371</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12763,7 +12835,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2291</v>
+                                    <v>2312</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -12778,7 +12850,7 @@
                                 <b>
                                     <a>145</a>
                                     <b>146</b>
-                                    <v>2618</v>
+                                    <v>2619</v>
                                 </b>
                                 <b>
                                     <a>146</a>
@@ -12799,27 +12871,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96583</v>
+                                    <v>96729</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>120259</v>
+                                    <v>120270</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>20096</v>
+                                    <v>20097</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>26706</v>
+                                    <v>26709</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>8384</v>
+                                    <v>8385</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13094,7 +13166,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>30262</v>
+                                    <v>30263</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13170,7 +13242,7 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>4386</v>
+                                    <v>4387</v>
                                 </b>
                                 <b>
                                     <a>19</a>
@@ -13231,7 +13303,7 @@
                                 <b>
                                     <a>17</a>
                                     <b>18</b>
-                                    <v>4386</v>
+                                    <v>4387</v>
                                 </b>
                                 <b>
                                     <a>19</a>
@@ -13437,15 +13509,15 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>7060555</cardinality>
+            <cardinality>7060560</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7019638</v>
+                    <v>7019643</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>3404844</v>
+                    <v>3404846</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -13467,7 +13539,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7019638</v>
+                                    <v>7019643</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13483,7 +13555,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7019638</v>
+                                    <v>7019643</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13499,7 +13571,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6978721</v>
+                                    <v>6978726</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13520,12 +13592,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1473137</v>
+                                    <v>1473138</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>926246</v>
+                                    <v>926247</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13540,7 +13612,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>145953</v>
+                                    <v>145954</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13556,12 +13628,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1473137</v>
+                                    <v>1473138</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>926246</v>
+                                    <v>926247</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -13576,7 +13648,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>65</b>
-                                    <v>145953</v>
+                                    <v>145954</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13592,17 +13664,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1781636</v>
+                                    <v>1781637</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1030659</v>
+                                    <v>1030660</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>437487</v>
+                                    <v>437488</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -13782,7 +13854,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>819587</v>
+                                    <v>819588</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13818,7 +13890,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>995106</v>
+                                    <v>995107</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13916,11 +13988,11 @@
         </relation>
         <relation>
             <name>membervariables</name>
-            <cardinality>1501943</cardinality>
+            <cardinality>1501944</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1499493</v>
+                    <v>1499494</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -13928,7 +14000,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>642219</v>
+                    <v>642220</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13942,7 +14014,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1497151</v>
+                                    <v>1497152</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13963,7 +14035,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1499493</v>
+                                    <v>1499494</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14046,7 +14118,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>122420</v>
+                                    <v>122421</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14278,19 +14350,19 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>725806</cardinality>
+            <cardinality>726016</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>725806</v>
+                    <v>726016</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53403</v>
+                    <v>53423</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>101564</v>
+                    <v>101594</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14304,7 +14376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725806</v>
+                                    <v>726016</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14320,7 +14392,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>725806</v>
+                                    <v>726016</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14336,37 +14408,37 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28845</v>
+                                    <v>28857</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7838</v>
+                                    <v>7840</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4027</v>
+                                    <v>4028</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4063</v>
+                                    <v>4064</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>12</b>
-                                    <v>4131</v>
+                                    <v>4132</v>
                                 </b>
                                 <b>
                                     <a>12</a>
                                     <b>162</b>
-                                    <v>4007</v>
+                                    <v>4008</v>
                                 </b>
                                 <b>
                                     <a>162</a>
                                     <b>19347</b>
-                                    <v>491</v>
+                                    <v>492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14382,22 +14454,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38343</v>
+                                    <v>38358</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6702</v>
+                                    <v>6704</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4474</v>
+                                    <v>4476</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>3509</b>
-                                    <v>3883</v>
+                                    <v>3884</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14413,32 +14485,32 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62497</v>
+                                    <v>62515</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16028</v>
+                                    <v>16032</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>6526</v>
+                                    <v>6528</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>8142</v>
+                                    <v>8144</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>134</b>
-                                    <v>7618</v>
+                                    <v>7620</v>
                                 </b>
                                 <b>
                                     <a>134</a>
                                     <b>7549</b>
-                                    <v>751</v>
+                                    <v>752</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14454,22 +14526,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84528</v>
+                                    <v>84553</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8406</v>
+                                    <v>8408</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>15</b>
-                                    <v>7678</v>
+                                    <v>7680</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>1509</b>
-                                    <v>951</v>
+                                    <v>952</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14547,15 +14619,15 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>44320</cardinality>
+            <cardinality>44321</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>44320</v>
+                    <v>44321</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>41050</v>
+                    <v>41051</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14569,7 +14641,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44320</v>
+                                    <v>44321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14585,7 +14657,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40198</v>
+                                    <v>40199</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15318,7 +15390,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347167</v>
+                                    <v>347168</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15339,7 +15411,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347167</v>
+                                    <v>347168</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -15392,7 +15464,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>347167</v>
+                                    <v>347168</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16179,15 +16251,15 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3030853</cardinality>
+            <cardinality>3030855</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3030853</v>
+                    <v>3030855</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1460537</v>
+                    <v>1460538</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16195,7 +16267,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1946677</v>
+                    <v>1946678</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16209,7 +16281,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3030853</v>
+                                    <v>3030855</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16225,7 +16297,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3030853</v>
+                                    <v>3030855</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16241,7 +16313,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3030853</v>
+                                    <v>3030855</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16257,7 +16329,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1344024</v>
+                                    <v>1344025</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16283,7 +16355,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1460537</v>
+                                    <v>1460538</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16299,7 +16371,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1344148</v>
+                                    <v>1344149</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16510,7 +16582,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1319324</v>
+                                    <v>1319325</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16535,11 +16607,11 @@
         </relation>
         <relation>
             <name>pointerishsize</name>
-            <cardinality>2247317</cardinality>
+            <cardinality>2247318</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>2247317</v>
+                    <v>2247318</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -16561,7 +16633,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2247317</v>
+                                    <v>2247318</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16577,7 +16649,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2247317</v>
+                                    <v>2247318</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17100,15 +17172,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1762011</cardinality>
+            <cardinality>1762169</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1762011</v>
+                    <v>1762169</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>837877</v>
+                    <v>837952</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17122,7 +17194,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1762011</v>
+                                    <v>1762169</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17138,22 +17210,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>662420</v>
+                                    <v>662479</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80933</v>
+                                    <v>80940</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>64163</v>
+                                    <v>64169</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>4526</b>
-                                    <v>30360</v>
+                                    <v>30363</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17163,7 +17235,7 @@
         </relation>
         <relation>
             <name>decltypes</name>
-            <cardinality>814485</cardinality>
+            <cardinality>814486</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -17171,7 +17243,7 @@
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>814485</v>
+                    <v>814486</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17301,7 +17373,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814485</v>
+                                    <v>814486</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17317,7 +17389,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814485</v>
+                                    <v>814486</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17333,7 +17405,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814485</v>
+                                    <v>814486</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17349,7 +17421,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>814485</v>
+                                    <v>814486</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17611,15 +17683,15 @@
         </relation>
         <relation>
             <name>type_operators</name>
-            <cardinality>7950</cardinality>
+            <cardinality>7949</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7950</v>
+                    <v>7949</v>
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>7177</v>
+                    <v>7176</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17627,7 +17699,7 @@
                 </e>
                 <e>
                     <k>base_type</k>
-                    <v>5243</v>
+                    <v>5242</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17641,7 +17713,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7950</v>
+                                    <v>7949</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17657,7 +17729,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7950</v>
+                                    <v>7949</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17673,7 +17745,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7950</v>
+                                    <v>7949</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17689,7 +17761,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6403</v>
+                                    <v>6402</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17710,7 +17782,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6403</v>
+                                    <v>6402</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17731,7 +17803,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7155</v>
+                                    <v>7154</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17927,15 +17999,15 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4150876</cardinality>
+            <cardinality>4151247</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4150876</v>
+                    <v>4151247</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>918367</v>
+                    <v>918449</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17953,7 +18025,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4150876</v>
+                                    <v>4151247</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17969,7 +18041,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4150876</v>
+                                    <v>4151247</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17985,22 +18057,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>654151</v>
+                                    <v>654210</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>158635</v>
+                                    <v>158649</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>70552</v>
+                                    <v>70559</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>32672</b>
-                                    <v>35028</v>
+                                    <v>35031</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18016,12 +18088,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>866633</v>
+                                    <v>866710</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>51734</v>
+                                    <v>51739</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18173,11 +18245,11 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1363554</cardinality>
+            <cardinality>1363676</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1363554</v>
+                    <v>1363676</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -18199,7 +18271,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1363554</v>
+                                    <v>1363676</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18215,7 +18287,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1363554</v>
+                                    <v>1363676</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18473,11 +18545,11 @@
         </relation>
         <relation>
             <name>usertype_alias_kind</name>
-            <cardinality>1762011</cardinality>
+            <cardinality>1762169</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1762011</v>
+                    <v>1762169</v>
                 </e>
                 <e>
                     <k>alias_kind</k>
@@ -18495,7 +18567,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1762011</v>
+                                    <v>1762169</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18526,26 +18598,26 @@
         </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>766231</cardinality>
+            <cardinality>766248</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>766231</v>
+                    <v>766248</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>type_template_type_constraint</name>
-            <cardinality>27118</cardinality>
+            <cardinality>27115</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13365</v>
+                    <v>13364</v>
                 </e>
                 <e>
                     <k>constraint</k>
-                    <v>25979</v>
+                    <v>25976</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18559,7 +18631,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10206</v>
+                                    <v>10205</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18595,7 +18667,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>24840</v>
+                                    <v>24837</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18610,15 +18682,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>7853946</cardinality>
+            <cardinality>7853951</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7853946</v>
+                    <v>7853951</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6364342</v>
+                    <v>6364346</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -18636,7 +18708,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7853946</v>
+                                    <v>7853951</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18652,7 +18724,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7853946</v>
+                                    <v>7853951</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18668,7 +18740,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6036258</v>
+                                    <v>6036261</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18689,7 +18761,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6364342</v>
+                                    <v>6364346</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18741,59 +18813,59 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>593785</cardinality>
+            <cardinality>593798</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>593785</v>
+                    <v>593798</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1124207</cardinality>
+            <cardinality>1124307</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1124207</v>
+                    <v>1124307</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1346034</cardinality>
+            <cardinality>1346155</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1346034</v>
+                    <v>1346155</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>232123</cardinality>
+            <cardinality>232144</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>232123</v>
+                    <v>232144</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1125875</cardinality>
+            <cardinality>1125965</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1122823</v>
+                    <v>1122924</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>71788</v>
+                    <v>71794</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18807,12 +18879,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1120680</v>
+                                    <v>1120790</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>2143</v>
+                                    <v>2133</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18828,12 +18900,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>20497</v>
+                                    <v>20499</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>12883</v>
+                                    <v>12884</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -18848,27 +18920,27 @@
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>6061</v>
+                                    <v>6072</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>5723</v>
+                                    <v>5713</v>
                                 </b>
                                 <b>
                                     <a>10</a>
                                     <b>17</b>
-                                    <v>5913</v>
+                                    <v>5903</v>
                                 </b>
                                 <b>
                                     <a>17</a>
                                     <b>51</b>
-                                    <v>5385</v>
+                                    <v>5396</v>
                                 </b>
                                 <b>
                                     <a>51</a>
                                     <b>4223</b>
-                                    <v>3558</v>
+                                    <v>3559</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18878,11 +18950,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2898088</cardinality>
+            <cardinality>2898347</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1366848</v>
+                    <v>1366971</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -18890,7 +18962,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>821942</v>
+                    <v>822016</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18904,27 +18976,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>579258</v>
+                                    <v>579310</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>410210</v>
+                                    <v>410247</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>250994</v>
+                                    <v>251017</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>103078</v>
+                                    <v>103087</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>113</b>
-                                    <v>23306</v>
+                                    <v>23308</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18940,22 +19012,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>607792</v>
+                                    <v>607846</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>424213</v>
+                                    <v>424251</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>251829</v>
+                                    <v>251851</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>113</b>
-                                    <v>83013</v>
+                                    <v>83021</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19063,22 +19135,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>513626</v>
+                                    <v>513672</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>167611</v>
+                                    <v>167626</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>75072</v>
+                                    <v>75079</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>47</b>
-                                    <v>61724</v>
+                                    <v>61729</v>
                                 </b>
                                 <b>
                                     <a>47</a>
@@ -19099,17 +19171,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>723679</v>
+                                    <v>723744</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>79898</v>
+                                    <v>79905</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>22</b>
-                                    <v>18364</v>
+                                    <v>18365</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19119,11 +19191,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>510048</cardinality>
+            <cardinality>510060</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>205797</v>
+                    <v>205802</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19131,7 +19203,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>509912</v>
+                    <v>509924</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19145,12 +19217,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>155787</v>
+                                    <v>155791</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>43367</v>
+                                    <v>43368</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -19171,12 +19243,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>147918</v>
+                                    <v>147921</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>40471</v>
+                                    <v>40472</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -19314,7 +19386,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>509776</v>
+                                    <v>509787</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19335,7 +19407,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>509912</v>
+                                    <v>509924</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19345,15 +19417,15 @@
         </relation>
         <relation>
             <name>is_proxy_class_for</name>
-            <cardinality>48429</cardinality>
+            <cardinality>48433</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>48429</v>
+                    <v>48433</v>
                 </e>
                 <e>
                     <k>templ_param_id</k>
-                    <v>45757</v>
+                    <v>45761</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19367,7 +19439,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>48429</v>
+                                    <v>48433</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19383,7 +19455,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45039</v>
+                                    <v>45043</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19398,11 +19470,11 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>5907627</cardinality>
+            <cardinality>5907630</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5907627</v>
+                    <v>5907630</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -19410,7 +19482,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5851317</v>
+                    <v>5851321</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -19428,7 +19500,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5907627</v>
+                                    <v>5907630</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19444,7 +19516,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5907627</v>
+                                    <v>5907630</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19460,7 +19532,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5907627</v>
+                                    <v>5907630</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19594,7 +19666,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5805627</v>
+                                    <v>5805631</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19615,7 +19687,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5805627</v>
+                                    <v>5805631</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19636,7 +19708,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5851317</v>
+                                    <v>5851321</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19705,15 +19777,15 @@
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>973767</cardinality>
+            <cardinality>973788</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>973767</v>
+                    <v>973788</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>182700</v>
+                    <v>182704</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19727,7 +19799,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>973767</v>
+                                    <v>973788</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19743,12 +19815,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>110581</v>
+                                    <v>110583</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42787</v>
+                                    <v>42788</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -19758,7 +19830,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>104</b>
-                                    <v>13728</v>
+                                    <v>13729</v>
                                 </b>
                                 <b>
                                     <a>119</a>
@@ -19773,11 +19845,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2484632</cardinality>
+            <cardinality>2484687</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1453189</v>
+                    <v>1453222</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19785,7 +19857,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>297982</v>
+                    <v>297989</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19799,22 +19871,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>782958</v>
+                                    <v>782976</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>413128</v>
+                                    <v>413137</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>171799</v>
+                                    <v>171802</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>85303</v>
+                                    <v>85305</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19830,22 +19902,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>802104</v>
+                                    <v>802122</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>411221</v>
+                                    <v>411230</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>169618</v>
+                                    <v>169622</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>70245</v>
+                                    <v>70247</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19983,12 +20055,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>174762</v>
+                                    <v>174766</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26333</v>
+                                    <v>26334</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20003,17 +20075,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>23233</v>
+                                    <v>23234</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>76</b>
-                                    <v>23369</v>
+                                    <v>23370</v>
                                 </b>
                                 <b>
                                     <a>79</a>
                                     <b>2452</b>
-                                    <v>7630</v>
+                                    <v>7631</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20029,7 +20101,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>256795</v>
+                                    <v>256801</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20049,11 +20121,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>452748</cardinality>
+            <cardinality>452758</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>196770</v>
+                    <v>196774</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20061,7 +20133,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>450057</v>
+                    <v>450067</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20075,12 +20147,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>151393</v>
+                                    <v>151396</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42890</v>
+                                    <v>42891</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20101,7 +20173,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>144477</v>
+                                    <v>144480</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20254,7 +20326,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>447365</v>
+                                    <v>447375</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20275,7 +20347,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>450057</v>
+                                    <v>450067</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20379,7 +20451,7 @@
         </relation>
         <relation>
             <name>variable_template_argument</name>
-            <cardinality>768940</cardinality>
+            <cardinality>768941</cardinality>
             <columnsizes>
                 <e>
                     <k>variable_id</k>
@@ -20849,7 +20921,7 @@
         </relation>
         <relation>
             <name>template_template_argument</name>
-            <cardinality>9673</cardinality>
+            <cardinality>9674</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
@@ -20861,7 +20933,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>9081</v>
+                    <v>9082</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21080,7 +21152,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9060</v>
+                                    <v>9061</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21231,19 +21303,19 @@
         </relation>
         <relation>
             <name>concept_templates</name>
-            <cardinality>3610</cardinality>
+            <cardinality>3609</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>3610</v>
+                    <v>3609</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>3610</v>
+                    <v>3609</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>3610</v>
+                    <v>3609</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21257,7 +21329,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3610</v>
+                                    <v>3609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21273,7 +21345,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3610</v>
+                                    <v>3609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21289,7 +21361,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3610</v>
+                                    <v>3609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21305,7 +21377,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3610</v>
+                                    <v>3609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21321,7 +21393,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3610</v>
+                                    <v>3609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21337,7 +21409,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3610</v>
+                                    <v>3609</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21347,15 +21419,15 @@
         </relation>
         <relation>
             <name>concept_instantiation</name>
-            <cardinality>90315</cardinality>
+            <cardinality>90305</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>90315</v>
+                    <v>90305</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>3438</v>
+                    <v>3437</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21369,7 +21441,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>90315</v>
+                                    <v>90305</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21465,22 +21537,22 @@
         </relation>
         <relation>
             <name>is_type_constraint</name>
-            <cardinality>36852</cardinality>
+            <cardinality>36848</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>36852</v>
+                    <v>36848</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>concept_template_argument</name>
-            <cardinality>112899</cardinality>
+            <cardinality>112887</cardinality>
             <columnsizes>
                 <e>
                     <k>concept_id</k>
-                    <v>76283</v>
+                    <v>76275</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -21488,7 +21560,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>21402</v>
+                    <v>21399</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21502,12 +21574,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46414</v>
+                                    <v>46409</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>24647</v>
+                                    <v>24644</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21528,12 +21600,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>50024</v>
+                                    <v>50019</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>22347</v>
+                                    <v>22345</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21636,7 +21708,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>10378</v>
+                                    <v>10377</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21687,12 +21759,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>18007</v>
+                                    <v>18005</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3266</v>
+                                    <v>3265</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -21838,15 +21910,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>604482</cardinality>
+            <cardinality>604495</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>604482</v>
+                    <v>604495</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>283845</v>
+                    <v>283851</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21860,7 +21932,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>604482</v>
+                                    <v>604495</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21876,7 +21948,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>234073</v>
+                                    <v>234078</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21896,7 +21968,7 @@
         </relation>
         <relation>
             <name>routinetypeargs</name>
-            <cardinality>1178519</cardinality>
+            <cardinality>1178520</cardinality>
             <columnsizes>
                 <e>
                     <k>routine</k>
@@ -21908,7 +21980,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>112073</v>
+                    <v>112074</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22262,15 +22334,15 @@
         </relation>
         <relation>
             <name>ptrtomembers</name>
-            <cardinality>9725</cardinality>
+            <cardinality>9726</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9725</v>
+                    <v>9726</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>7972</v>
+                    <v>7973</v>
                 </e>
                 <e>
                     <k>class_id</k>
@@ -22288,7 +22360,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9725</v>
+                                    <v>9726</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22304,7 +22376,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9725</v>
+                                    <v>9726</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22362,7 +22434,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3896</v>
+                                    <v>3897</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22393,7 +22465,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3896</v>
+                                    <v>3897</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22466,15 +22538,15 @@
         </relation>
         <relation>
             <name>typespecifiers</name>
-            <cardinality>854142</cardinality>
+            <cardinality>854164</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>846657</v>
+                    <v>849020</v>
                 </e>
                 <e>
                     <k>spec_id</k>
-                    <v>1621</v>
+                    <v>95</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -22488,12 +22560,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>839173</v>
+                                    <v>843877</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7484</v>
+                                    <v>5143</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22507,69 +22579,49 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>1</a>
-                                    <b>2</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>2</a>
-                                    <b>3</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>17</a>
-                                    <b>18</b>
-                                    <v>124</v>
-                                </b>
-                                <b>
-                                    <a>24</a>
-                                    <b>25</b>
-                                    <v>124</v>
+                                    <a>168</a>
+                                    <b>169</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>44</a>
-                                    <b>45</b>
-                                    <v>124</v>
+                                    <a>215</a>
+                                    <b>216</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>49</a>
-                                    <b>50</b>
-                                    <v>124</v>
+                                    <a>225</a>
+                                    <b>226</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>51</a>
-                                    <b>52</b>
-                                    <v>124</v>
+                                    <a>533</a>
+                                    <b>534</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>112</a>
-                                    <b>113</b>
-                                    <v>124</v>
+                                    <a>821</a>
+                                    <b>822</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>199</a>
-                                    <b>200</b>
-                                    <v>124</v>
+                                    <a>1568</a>
+                                    <b>1569</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>325</a>
-                                    <b>326</b>
-                                    <v>124</v>
+                                    <a>4195</a>
+                                    <b>4196</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>545</a>
-                                    <b>546</b>
-                                    <v>124</v>
+                                    <a>18295</a>
+                                    <b>18296</b>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>5462</a>
-                                    <b>5463</b>
-                                    <v>124</v>
+                                    <a>54858</a>
+                                    <b>54859</b>
+                                    <v>10</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22579,11 +22631,11 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>9714174</cardinality>
+            <cardinality>9714180</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>4008745</v>
+                    <v>4008747</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -22601,7 +22653,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1527028</v>
+                                    <v>1527029</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -22616,7 +22668,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>692844</v>
+                                    <v>692845</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -22737,11 +22789,11 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>3075512</cardinality>
+            <cardinality>3075514</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>2315054</v>
+                    <v>2315056</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -22759,7 +22811,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1658261</v>
+                                    <v>1658263</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23405,7 +23457,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>642571</v>
+                                    <v>642572</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -23979,11 +24031,11 @@
         </relation>
         <relation>
             <name>attribute_arg_value</name>
-            <cardinality>16692</cardinality>
+            <cardinality>16693</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>16692</v>
+                    <v>16693</v>
                 </e>
                 <e>
                     <k>value</k>
@@ -24001,7 +24053,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>16692</v>
+                                    <v>16693</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24072,15 +24124,15 @@
         </relation>
         <relation>
             <name>attribute_arg_type</name>
-            <cardinality>459</cardinality>
+            <cardinality>460</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>459</v>
+                    <v>460</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>83</v>
+                    <v>84</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24094,7 +24146,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>459</v>
+                                    <v>460</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24110,22 +24162,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71</v>
+                                    <v>72</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3</v>
+                                    <v>4</v>
                                 </b>
                                 <b>
                                     <a>35</a>
                                     <b>36</b>
-                                    <v>3</v>
+                                    <v>4</v>
                                 </b>
                                 <b>
                                     <a>60</a>
                                     <b>61</b>
-                                    <v>3</v>
+                                    <v>4</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24135,15 +24187,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>71883</cardinality>
+            <cardinality>71889</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>71883</v>
+                    <v>71889</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>71883</v>
+                    <v>71889</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24157,7 +24209,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71883</v>
+                                    <v>71889</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24173,7 +24225,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71883</v>
+                                    <v>71889</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24351,7 +24403,7 @@
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>799004</v>
+                    <v>799005</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -24369,7 +24421,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>758960</v>
+                                    <v>758961</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24594,15 +24646,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>7174200</cardinality>
+            <cardinality>7174204</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>7174200</v>
+                    <v>7174204</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>3962838</v>
+                    <v>3962840</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24616,7 +24668,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7174200</v>
+                                    <v>7174204</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24632,12 +24684,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2481093</v>
+                                    <v>2481094</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1116610</v>
+                                    <v>1116611</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24657,7 +24709,7 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4189503</cardinality>
+            <cardinality>4189506</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -24669,7 +24721,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4184887</v>
+                    <v>4184890</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24703,7 +24755,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>42413</v>
+                                    <v>42414</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -24947,7 +24999,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4184887</v>
+                                    <v>4184890</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24963,7 +25015,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4180272</v>
+                                    <v>4180274</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24978,15 +25030,15 @@
         </relation>
         <relation>
             <name>enclosingfunction</name>
-            <cardinality>114805</cardinality>
+            <cardinality>114807</cardinality>
             <columnsizes>
                 <e>
                     <k>child</k>
-                    <v>114805</v>
+                    <v>114807</v>
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>71335</v>
+                    <v>71337</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25000,7 +25052,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>114805</v>
+                                    <v>114807</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25016,7 +25068,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>49328</v>
+                                    <v>49329</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25041,15 +25093,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>476867</cardinality>
+            <cardinality>476878</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>476867</v>
+                    <v>476878</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>455133</v>
+                    <v>455143</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25057,11 +25109,11 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>235538</v>
+                    <v>235543</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>35395</v>
+                    <v>35396</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25075,7 +25127,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476867</v>
+                                    <v>476878</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25091,7 +25143,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476867</v>
+                                    <v>476878</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25107,7 +25159,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476867</v>
+                                    <v>476878</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25123,7 +25175,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>476867</v>
+                                    <v>476878</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25139,7 +25191,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438610</v>
+                                    <v>438620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25160,7 +25212,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438610</v>
+                                    <v>438620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25181,7 +25233,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438610</v>
+                                    <v>438620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25202,7 +25254,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>438610</v>
+                                    <v>438620</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25362,7 +25414,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>225726</v>
+                                    <v>225732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25383,7 +25435,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>225726</v>
+                                    <v>225732</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25404,7 +25456,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>235095</v>
+                                    <v>235100</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25425,7 +25477,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>230189</v>
+                                    <v>230194</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25518,7 +25570,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>35395</v>
+                                    <v>35396</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25559,11 +25611,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>478639</cardinality>
+            <cardinality>478649</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>476424</v>
+                    <v>476435</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -25581,7 +25633,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>474210</v>
+                                    <v>474221</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25627,11 +25679,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>449955</cardinality>
+            <cardinality>449965</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>449955</v>
+                    <v>449965</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -25649,7 +25701,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>449955</v>
+                                    <v>449965</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25846,23 +25898,23 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>699835</cardinality>
+            <cardinality>700430</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>699835</v>
+                    <v>700430</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>42413</v>
+                    <v>42414</v>
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>77876</v>
+                    <v>77742</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6097</v>
+                    <v>6098</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -25876,7 +25928,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>699835</v>
+                                    <v>700430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25892,7 +25944,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>699835</v>
+                                    <v>700430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25908,7 +25960,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>699835</v>
+                                    <v>700430</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25924,12 +25976,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6200</v>
+                                    <v>6166</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14001</v>
+                                    <v>13967</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -25944,7 +25996,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>20</b>
-                                    <v>3577</v>
+                                    <v>3645</v>
                                 </b>
                                 <b>
                                     <a>20</a>
@@ -25980,12 +26032,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6200</v>
+                                    <v>6166</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>14001</v>
+                                    <v>13967</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26000,7 +26052,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>20</b>
-                                    <v>3577</v>
+                                    <v>3645</v>
                                 </b>
                                 <b>
                                     <a>20</a>
@@ -26036,7 +26088,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>41050</v>
+                                    <v>41051</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26057,12 +26109,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>48170</v>
+                                    <v>47864</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5893</v>
+                                    <v>6064</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26072,17 +26124,17 @@
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>5995</v>
+                                    <v>6064</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>40</b>
-                                    <v>6097</v>
+                                    <v>6064</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>164</b>
-                                    <v>5723</v>
+                                    <v>5689</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26098,12 +26150,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>48170</v>
+                                    <v>47864</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5893</v>
+                                    <v>6064</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26113,17 +26165,17 @@
                                 <b>
                                     <a>8</a>
                                     <b>15</b>
-                                    <v>5995</v>
+                                    <v>6064</v>
                                 </b>
                                 <b>
                                     <a>15</a>
                                     <b>40</b>
-                                    <v>6097</v>
+                                    <v>6064</v>
                                 </b>
                                 <b>
                                     <a>40</a>
                                     <b>164</b>
-                                    <v>5723</v>
+                                    <v>5689</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26139,7 +26191,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>77195</v>
+                                    <v>77060</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26164,7 +26216,7 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>20354</b>
+                                    <b>20371</b>
                                     <v>374</v>
                                 </b>
                             </bs>
@@ -26206,7 +26258,7 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>2133</b>
+                                    <b>2129</b>
                                     <v>340</v>
                                 </b>
                             </bs>
@@ -26217,19 +26269,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>11233093</cardinality>
+            <cardinality>11233100</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11233093</v>
+                    <v>11233100</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>4303522</v>
+                    <v>4303524</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11233093</v>
+                    <v>11233100</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26243,7 +26295,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11233093</v>
+                                    <v>11233100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26259,7 +26311,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11233093</v>
+                                    <v>11233100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26275,12 +26327,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3928782</v>
+                                    <v>3928784</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>322969</v>
+                                    <v>322970</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -26301,12 +26353,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3928782</v>
+                                    <v>3928784</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>322969</v>
+                                    <v>322970</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -26327,7 +26379,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11233093</v>
+                                    <v>11233100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26343,7 +26395,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11233093</v>
+                                    <v>11233100</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26353,15 +26405,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3914685</cardinality>
+            <cardinality>3914688</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3350704</v>
+                    <v>3350706</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3749146</v>
+                    <v>3749148</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26375,7 +26427,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3289079</v>
+                                    <v>3289081</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26396,7 +26448,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3583607</v>
+                                    <v>3583609</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26411,15 +26463,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>9633161</cardinality>
+            <cardinality>9633168</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9633056</v>
+                    <v>9633062</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>9633161</v>
+                    <v>9633168</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26433,7 +26485,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9632950</v>
+                                    <v>9632957</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26454,7 +26506,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9633161</v>
+                                    <v>9633168</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26464,22 +26516,22 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>9893081</cardinality>
+            <cardinality>9895967</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9893081</v>
+                    <v>9895967</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1669514</cardinality>
+            <cardinality>1669328</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>1243336</v>
+                    <v>1243197</v>
                 </e>
                 <e>
                     <k>i</k>
@@ -26487,7 +26539,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1669514</v>
+                    <v>1669328</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26501,17 +26553,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>827601</v>
+                                    <v>827509</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408944</v>
+                                    <v>408898</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>6790</v>
+                                    <v>6789</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26527,17 +26579,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>827601</v>
+                                    <v>827509</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408944</v>
+                                    <v>408898</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>6790</v>
+                                    <v>6789</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26685,7 +26737,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1669514</v>
+                                    <v>1669328</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26701,7 +26753,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1669514</v>
+                                    <v>1669328</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26711,11 +26763,11 @@
         </relation>
         <relation>
             <name>namespaces</name>
-            <cardinality>8648</cardinality>
+            <cardinality>8649</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>8648</v>
+                    <v>8649</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -26733,7 +26785,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8648</v>
+                                    <v>8649</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26780,7 +26832,7 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2038490</cardinality>
+            <cardinality>2038492</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
@@ -26788,7 +26840,7 @@
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2038490</v>
+                    <v>2038492</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26878,7 +26930,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2038490</v>
+                                    <v>2038492</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26888,11 +26940,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19454445</cardinality>
+            <cardinality>19454457</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19454445</v>
+                    <v>19454457</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -26900,7 +26952,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12940139</v>
+                    <v>12940148</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26914,7 +26966,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19454445</v>
+                                    <v>19454457</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26930,7 +26982,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19454445</v>
+                                    <v>19454457</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27048,17 +27100,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7394844</v>
+                                    <v>7394848</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5082739</v>
+                                    <v>5082743</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>462555</v>
+                                    <v>462556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27074,17 +27126,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7394844</v>
+                                    <v>7394848</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5082739</v>
+                                    <v>5082743</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>712</b>
-                                    <v>462555</v>
+                                    <v>462556</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27094,22 +27146,22 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6899307</cardinality>
+            <cardinality>6899311</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6899307</v>
+                    <v>6899311</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>conversionkinds</name>
-            <cardinality>6050440</cardinality>
+            <cardinality>6050443</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6050440</v>
+                    <v>6050443</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27127,7 +27179,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6050440</v>
+                                    <v>6050443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27171,8 +27223,8 @@
                                     <v>1</v>
                                 </b>
                                 <b>
-                                    <a>5831532</a>
-                                    <b>5831533</b>
+                                    <a>5831535</a>
+                                    <b>5831536</b>
                                     <v>1</v>
                                 </b>
                             </bs>
@@ -27183,11 +27235,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>5800862</cardinality>
+            <cardinality>5800192</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>5800862</v>
+                    <v>5800192</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27205,7 +27257,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5800862</v>
+                                    <v>5800192</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27229,8 +27281,8 @@
                                     <v>21</v>
                                 </b>
                                 <b>
-                                    <a>268316</a>
-                                    <b>268317</b>
+                                    <a>268315</a>
+                                    <b>268316</b>
                                     <v>21</v>
                                 </b>
                             </bs>
@@ -27241,11 +27293,11 @@
         </relation>
         <relation>
             <name>numtemplatearguments</name>
-            <cardinality>627726</cardinality>
+            <cardinality>627727</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>627726</v>
+                    <v>627727</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -27263,7 +27315,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>627726</v>
+                                    <v>627727</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27347,23 +27399,23 @@
         </relation>
         <relation>
             <name>namequalifiers</name>
-            <cardinality>3037999</cardinality>
+            <cardinality>3037638</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3037999</v>
+                    <v>3037638</v>
                 </e>
                 <e>
                     <k>qualifiableelement</k>
-                    <v>3037999</v>
+                    <v>3037638</v>
                 </e>
                 <e>
                     <k>qualifyingelement</k>
-                    <v>47424</v>
+                    <v>47419</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>551734</v>
+                    <v>551672</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27377,7 +27429,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3037999</v>
+                                    <v>3037638</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27393,7 +27445,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3037999</v>
+                                    <v>3037638</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27409,7 +27461,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3037999</v>
+                                    <v>3037638</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27425,7 +27477,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3037999</v>
+                                    <v>3037638</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27441,7 +27493,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3037999</v>
+                                    <v>3037638</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27457,7 +27509,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3037999</v>
+                                    <v>3037638</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27473,22 +27525,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31501</v>
+                                    <v>31498</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8165</v>
+                                    <v>8164</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4104</v>
+                                    <v>4103</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>6811</b>
-                                    <v>3567</v>
+                                    <b>6810</b>
+                                    <v>3566</v>
                                 </b>
                                 <b>
                                     <a>19018</a>
@@ -27509,22 +27561,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>31501</v>
+                                    <v>31498</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8165</v>
+                                    <v>8164</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>4104</v>
+                                    <v>4103</v>
                                 </b>
                                 <b>
                                     <a>5</a>
-                                    <b>6811</b>
-                                    <v>3567</v>
+                                    <b>6810</b>
+                                    <v>3566</v>
                                 </b>
                                 <b>
                                     <a>19018</a>
@@ -27545,17 +27597,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>34359</v>
+                                    <v>34356</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>7349</v>
+                                    <v>7348</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>6</b>
-                                    <v>3567</v>
+                                    <v>3566</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -27576,22 +27628,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79034</v>
+                                    <v>79046</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>38055</v>
+                                    <v>38030</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>398479</v>
+                                    <v>398435</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36164</v>
+                                    <v>36160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27607,22 +27659,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>79034</v>
+                                    <v>79046</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>6</b>
-                                    <v>38055</v>
+                                    <v>38030</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>398479</v>
+                                    <v>398435</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>192</b>
-                                    <v>36164</v>
+                                    <v>36160</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27638,22 +27690,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>111395</v>
+                                    <v>111383</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>13279</v>
+                                    <v>13278</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>414767</v>
+                                    <v>414721</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>33</b>
-                                    <v>12291</v>
+                                    <v>12289</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27663,15 +27715,15 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>8254728</cardinality>
+            <cardinality>8254733</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>8254728</v>
+                    <v>8254733</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>1050388</v>
+                    <v>1050389</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27685,7 +27737,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8254728</v>
+                                    <v>8254733</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27701,12 +27753,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171537</v>
+                                    <v>171538</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>188702</v>
+                                    <v>188703</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27756,15 +27808,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>5810554</cardinality>
+            <cardinality>5809904</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>5808083</v>
+                    <v>5807433</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>275716</v>
+                    <v>275686</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27778,12 +27830,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5805611</v>
+                                    <v>5804962</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2471</v>
+                                    <v>2470</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27799,27 +27851,27 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>181318</v>
+                                    <v>181298</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>38786</v>
+                                    <v>38782</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>17169</v>
+                                    <v>17167</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>22713</v>
+                                    <v>22710</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>37798</b>
-                                    <v>15729</v>
+                                    <v>15727</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27829,11 +27881,11 @@
         </relation>
         <relation>
             <name>expr_allocator</name>
-            <cardinality>45240</cardinality>
+            <cardinality>45241</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>45240</v>
+                    <v>45241</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -27855,7 +27907,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45240</v>
+                                    <v>45241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27871,7 +27923,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>45240</v>
+                                    <v>45241</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27955,11 +28007,11 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>53825</cardinality>
+            <cardinality>53826</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>53825</v>
+                    <v>53826</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -27981,7 +28033,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53825</v>
+                                    <v>53826</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27997,7 +28049,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53825</v>
+                                    <v>53826</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28246,11 +28298,11 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>13474763</cardinality>
+            <cardinality>13474772</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13474763</v>
+                    <v>13474772</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -28268,7 +28320,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13474763</v>
+                                    <v>13474772</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28314,11 +28366,11 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>6647515</cardinality>
+            <cardinality>6647555</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6647515</v>
+                    <v>6647555</v>
                 </e>
                 <e>
                     <k>text</k>
@@ -28336,7 +28388,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6647515</v>
+                                    <v>6647555</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28377,15 +28429,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>13583347</cardinality>
+            <cardinality>13583356</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>13474763</v>
+                    <v>13474772</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>13583347</v>
+                    <v>13583356</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28399,7 +28451,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13384208</v>
+                                    <v>13384216</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28420,7 +28472,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13583347</v>
+                                    <v>13583356</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28430,11 +28482,11 @@
         </relation>
         <relation>
             <name>fieldoffsets</name>
-            <cardinality>1499493</cardinality>
+            <cardinality>1499494</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1499493</v>
+                    <v>1499494</v>
                 </e>
                 <e>
                     <k>byteoffset</k>
@@ -28456,7 +28508,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1499493</v>
+                                    <v>1499494</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28472,7 +28524,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1499493</v>
+                                    <v>1499494</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28817,19 +28869,19 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>2247635</cardinality>
+            <cardinality>2247637</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>2247635</v>
+                    <v>2247637</v>
                 </e>
                 <e>
                     <k>var</k>
-                    <v>979695</v>
+                    <v>979696</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>2247635</v>
+                    <v>2247637</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -28847,7 +28899,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2247635</v>
+                                    <v>2247637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28863,7 +28915,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2247635</v>
+                                    <v>2247637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28879,7 +28931,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2247635</v>
+                                    <v>2247637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28947,7 +28999,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>979687</v>
+                                    <v>979688</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28968,7 +29020,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2247635</v>
+                                    <v>2247637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28984,7 +29036,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2247635</v>
+                                    <v>2247637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29000,7 +29052,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2247635</v>
+                                    <v>2247637</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29016,7 +29068,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414607</v>
+                                    <v>414608</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29073,7 +29125,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>414607</v>
+                                    <v>414608</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29098,26 +29150,26 @@
         </relation>
         <relation>
             <name>braced_initialisers</name>
-            <cardinality>68436</cardinality>
+            <cardinality>68305</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>68436</v>
+                    <v>68305</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>expr_ancestor</name>
-            <cardinality>1675488</cardinality>
+            <cardinality>1675301</cardinality>
             <columnsizes>
                 <e>
                     <k>exp</k>
-                    <v>1675488</v>
+                    <v>1675301</v>
                 </e>
                 <e>
                     <k>ancestor</k>
-                    <v>838560</v>
+                    <v>838467</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29131,7 +29183,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1675488</v>
+                                    <v>1675301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29147,17 +29199,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17061</v>
+                                    <v>17059</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>811442</v>
+                                    <v>811351</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>19</b>
-                                    <v>10056</v>
+                                    <v>10055</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29167,11 +29219,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25210871</cardinality>
+            <cardinality>25210887</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25210871</v>
+                    <v>25210887</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -29179,7 +29231,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>10585982</v>
+                    <v>10585988</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29193,7 +29245,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210871</v>
+                                    <v>25210887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29209,7 +29261,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210871</v>
+                                    <v>25210887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29387,7 +29439,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8903992</v>
+                                    <v>8903998</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29418,7 +29470,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9043396</v>
+                                    <v>9043402</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29438,15 +29490,15 @@
         </relation>
         <relation>
             <name>expr_reuse</name>
-            <cardinality>845931</cardinality>
+            <cardinality>845836</cardinality>
             <columnsizes>
                 <e>
                     <k>reuse</k>
-                    <v>845931</v>
+                    <v>845836</v>
                 </e>
                 <e>
                     <k>original</k>
-                    <v>845931</v>
+                    <v>845836</v>
                 </e>
                 <e>
                     <k>value_category</k>
@@ -29464,7 +29516,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>845931</v>
+                                    <v>845836</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29480,7 +29532,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>845931</v>
+                                    <v>845836</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29496,7 +29548,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>845931</v>
+                                    <v>845836</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29512,7 +29564,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>845931</v>
+                                    <v>845836</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29564,11 +29616,11 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25210871</cardinality>
+            <cardinality>25210887</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25210871</v>
+                    <v>25210887</v>
                 </e>
                 <e>
                     <k>typeid</k>
@@ -29590,7 +29642,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210871</v>
+                                    <v>25210887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29606,7 +29658,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25210871</v>
+                                    <v>25210887</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29751,15 +29803,15 @@
         </relation>
         <relation>
             <name>new_allocated_type</name>
-            <cardinality>46194</cardinality>
+            <cardinality>46195</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>46194</v>
+                    <v>46195</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>27389</v>
+                    <v>27390</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29773,7 +29825,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46194</v>
+                                    <v>46195</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31208,15 +31260,15 @@
         </relation>
         <relation>
             <name>condition_decl_bind</name>
-            <cardinality>408385</cardinality>
+            <cardinality>408340</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>408385</v>
+                    <v>408340</v>
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>408385</v>
+                    <v>408340</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -31230,7 +31282,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408385</v>
+                                    <v>408340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31246,7 +31298,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>408385</v>
+                                    <v>408340</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31256,11 +31308,11 @@
         </relation>
         <relation>
             <name>typeid_bind</name>
-            <cardinality>47898</cardinality>
+            <cardinality>47899</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>47898</v>
+                    <v>47899</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -31278,7 +31330,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47898</v>
+                                    <v>47899</v>
                                 </b>
                             </bs>
                         </hist>
@@ -31367,11 +31419,11 @@
         </relation>
         <relation>
             <name>sizeof_bind</name>
-            <cardinality>242029</cardinality>
+            <cardinality>242030</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>242029</v>
+                    <v>242030</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -31389,7 +31441,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>242029</v>
+                                    <v>242030</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33088,11 +33140,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>6358197</cardinality>
+            <cardinality>6358201</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6358197</v>
+                    <v>6358201</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -33100,7 +33152,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2679767</v>
+                    <v>2679769</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33114,7 +33166,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6358197</v>
+                                    <v>6358201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33130,7 +33182,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6358197</v>
+                                    <v>6358201</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33368,7 +33420,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2221078</v>
+                                    <v>2221080</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33399,7 +33451,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2596949</v>
+                                    <v>2596951</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33569,15 +33621,15 @@
         </relation>
         <relation>
             <name>if_then</name>
-            <cardinality>990226</cardinality>
+            <cardinality>990227</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>990226</v>
+                    <v>990227</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>990226</v>
+                    <v>990227</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33591,7 +33643,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>990226</v>
+                                    <v>990227</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33607,7 +33659,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>990226</v>
+                                    <v>990227</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33617,15 +33669,15 @@
         </relation>
         <relation>
             <name>if_else</name>
-            <cardinality>436535</cardinality>
+            <cardinality>436486</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>436535</v>
+                    <v>436486</v>
                 </e>
                 <e>
                     <k>else_id</k>
-                    <v>436535</v>
+                    <v>436486</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33639,7 +33691,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>436535</v>
+                                    <v>436486</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33655,7 +33707,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>436535</v>
+                                    <v>436486</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33713,15 +33765,15 @@
         </relation>
         <relation>
             <name>constexpr_if_then</name>
-            <cardinality>106034</cardinality>
+            <cardinality>106035</cardinality>
             <columnsizes>
                 <e>
                     <k>constexpr_if_stmt</k>
-                    <v>106034</v>
+                    <v>106035</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>106034</v>
+                    <v>106035</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33735,7 +33787,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>106034</v>
+                                    <v>106035</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33751,7 +33803,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>106034</v>
+                                    <v>106035</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33953,15 +34005,15 @@
         </relation>
         <relation>
             <name>do_body</name>
-            <cardinality>233643</cardinality>
+            <cardinality>233644</cardinality>
             <columnsizes>
                 <e>
                     <k>do_stmt</k>
-                    <v>233643</v>
+                    <v>233644</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>233643</v>
+                    <v>233644</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33975,7 +34027,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>233643</v>
+                                    <v>233644</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33991,7 +34043,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>233643</v>
+                                    <v>233644</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34049,11 +34101,11 @@
         </relation>
         <relation>
             <name>switch_case</name>
-            <cardinality>835058</cardinality>
+            <cardinality>834964</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>411329</v>
+                    <v>411283</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -34061,7 +34113,7 @@
                 </e>
                 <e>
                     <k>case_id</k>
-                    <v>835058</v>
+                    <v>834964</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34080,7 +34132,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408450</v>
+                                    <v>408404</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34106,7 +34158,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408450</v>
+                                    <v>408404</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34269,7 +34321,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>835058</v>
+                                    <v>834964</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34285,7 +34337,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>835058</v>
+                                    <v>834964</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34295,15 +34347,15 @@
         </relation>
         <relation>
             <name>switch_body</name>
-            <cardinality>411329</cardinality>
+            <cardinality>411283</cardinality>
             <columnsizes>
                 <e>
                     <k>switch_stmt</k>
-                    <v>411329</v>
+                    <v>411283</v>
                 </e>
                 <e>
                     <k>body_id</k>
-                    <v>411329</v>
+                    <v>411283</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34317,7 +34369,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>411329</v>
+                                    <v>411283</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34333,7 +34385,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>411329</v>
+                                    <v>411283</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34535,11 +34587,11 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>5618643</cardinality>
+            <cardinality>5618647</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5618643</v>
+                    <v>5618647</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -34547,7 +34599,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2377534</v>
+                    <v>2377536</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34561,7 +34613,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5618643</v>
+                                    <v>5618647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34577,7 +34629,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5618643</v>
+                                    <v>5618647</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34715,12 +34767,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1356880</v>
+                                    <v>1356881</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>516457</v>
+                                    <v>516458</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34756,12 +34808,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1356880</v>
+                                    <v>1356881</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>516457</v>
+                                    <v>516458</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34791,22 +34843,22 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>43770</cardinality>
+            <cardinality>43779</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>43770</v>
+                    <v>43779</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>stmt_decl_bind</name>
-            <cardinality>724592</cardinality>
+            <cardinality>724593</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>714042</v>
+                    <v>714043</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -34814,7 +34866,7 @@
                 </e>
                 <e>
                     <k>decl</k>
-                    <v>724592</v>
+                    <v>724593</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34828,7 +34880,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>706590</v>
+                                    <v>706591</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34849,7 +34901,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>706590</v>
+                                    <v>706591</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -34982,7 +35034,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724592</v>
+                                    <v>724593</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34998,7 +35050,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724592</v>
+                                    <v>724593</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35008,11 +35060,11 @@
         </relation>
         <relation>
             <name>stmt_decl_entry_bind</name>
-            <cardinality>724592</cardinality>
+            <cardinality>724593</cardinality>
             <columnsizes>
                 <e>
                     <k>stmt</k>
-                    <v>714042</v>
+                    <v>714043</v>
                 </e>
                 <e>
                     <k>num</k>
@@ -35020,7 +35072,7 @@
                 </e>
                 <e>
                     <k>decl_entry</k>
-                    <v>724592</v>
+                    <v>724593</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35034,7 +35086,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>706590</v>
+                                    <v>706591</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35055,7 +35107,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>706590</v>
+                                    <v>706591</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35188,7 +35240,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724592</v>
+                                    <v>724593</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35204,7 +35256,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724592</v>
+                                    <v>724593</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35214,15 +35266,15 @@
         </relation>
         <relation>
             <name>blockscope</name>
-            <cardinality>1644290</cardinality>
+            <cardinality>1644291</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>1644290</v>
+                    <v>1644291</v>
                 </e>
                 <e>
                     <k>enclosing</k>
-                    <v>1427105</v>
+                    <v>1427106</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35236,7 +35288,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1644290</v>
+                                    <v>1644291</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35252,7 +35304,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1294499</v>
+                                    <v>1294500</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35272,11 +35324,11 @@
         </relation>
         <relation>
             <name>jumpinfo</name>
-            <cardinality>348324</cardinality>
+            <cardinality>348325</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>348324</v>
+                    <v>348325</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -35284,7 +35336,7 @@
                 </e>
                 <e>
                     <k>target</k>
-                    <v>72706</v>
+                    <v>72707</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35298,7 +35350,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348324</v>
+                                    <v>348325</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35314,7 +35366,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>348324</v>
+                                    <v>348325</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35443,7 +35495,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>72706</v>
+                                    <v>72707</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35453,11 +35505,11 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5408281</cardinality>
+            <cardinality>5408285</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5408281</v>
+                    <v>5408285</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -35465,7 +35517,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5405038</v>
+                    <v>5405041</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35479,7 +35531,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5408281</v>
+                                    <v>5408285</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35495,7 +35547,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5408281</v>
+                                    <v>5408285</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35643,7 +35695,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5404913</v>
+                                    <v>5404916</v>
                                 </b>
                                 <b>
                                     <a>27</a>
@@ -35664,7 +35716,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5405038</v>
+                                    <v>5405041</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35674,7 +35726,7 @@
         </relation>
         <relation>
             <name>preprocpair</name>
-            <cardinality>1141185</cardinality>
+            <cardinality>1141186</cardinality>
             <columnsizes>
                 <e>
                     <k>begin</k>
@@ -35682,7 +35734,7 @@
                 </e>
                 <e>
                     <k>elseelifend</k>
-                    <v>1141185</v>
+                    <v>1141186</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35696,7 +35748,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>649557</v>
+                                    <v>649558</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35722,7 +35774,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1141185</v>
+                                    <v>1141186</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35732,11 +35784,11 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>439358</cardinality>
+            <cardinality>439359</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>439358</v>
+                    <v>439359</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -35754,19 +35806,19 @@
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>4352298</cardinality>
+            <cardinality>4352301</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4352298</v>
+                    <v>4352301</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2955007</v>
+                    <v>2955008</v>
                 </e>
                 <e>
                     <k>body</k>
-                    <v>1683336</v>
+                    <v>1683337</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35780,7 +35832,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4352298</v>
+                                    <v>4352301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35796,7 +35848,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4352298</v>
+                                    <v>4352301</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35812,7 +35864,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2756409</v>
+                                    <v>2756411</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35833,7 +35885,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2873796</v>
+                                    <v>2873798</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35854,12 +35906,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1535136</v>
+                                    <v>1535137</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>127241</v>
+                                    <v>127242</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -35880,7 +35932,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1539378</v>
+                                    <v>1539379</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35900,15 +35952,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>318569</cardinality>
+            <cardinality>318598</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>318569</v>
+                    <v>318598</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>58683</v>
+                    <v>58688</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35922,7 +35974,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>318569</v>
+                                    <v>318598</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35938,17 +35990,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>29040</v>
+                                    <v>29043</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9440</v>
+                                    <v>9441</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4952</v>
+                                    <v>4953</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -35958,7 +36010,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>4519</v>
+                                    <v>4520</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -36026,11 +36078,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>30400377</cardinality>
+            <cardinality>30401054</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3866383</v>
+                    <v>3866469</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -36048,17 +36100,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>530489</v>
+                                    <v>530500</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>9</b>
-                                    <v>26946</v>
+                                    <v>26947</v>
                                 </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3308947</v>
+                                    <v>3309021</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/cpp/ql/lib/upgrades/1a6854060d5d3ada16c580a29f8c5ce21f3367f8/old.dbscheme b/cpp/ql/lib/upgrades/1a6854060d5d3ada16c580a29f8c5ce21f3367f8/old.dbscheme
new file mode 100644
index 000000000000..1a6854060d5d
--- /dev/null
+++ b/cpp/ql/lib/upgrades/1a6854060d5d3ada16c580a29f8c5ce21f3367f8/old.dbscheme
@@ -0,0 +1,2450 @@
+/*- 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             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @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
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/*- XML Files -*/
+
+xmlEncoding(
+  unique int id: @file ref,
+  string encoding: string ref
+);
+
+xmlDTDs(
+  unique int id: @xmldtd,
+  string root: string ref,
+  string publicId: string ref,
+  string systemId: string ref,
+  int fileid: @file ref
+);
+
+xmlElements(
+  unique int id: @xmlelement,
+  string name: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlAttrs(
+  unique int id: @xmlattribute,
+  int elementid: @xmlelement ref,
+  string name: string ref,
+  string value: string ref,
+  int idx: int ref,
+  int fileid: @file ref
+);
+
+xmlNs(
+  int id: @xmlnamespace,
+  string prefixName: string ref,
+  string URI: string ref,
+  int fileid: @file ref
+);
+
+xmlHasNs(
+  int elementId: @xmlnamespaceable ref,
+  int nsId: @xmlnamespace ref,
+  int fileid: @file ref
+);
+
+xmlComments(
+  unique int id: @xmlcomment,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int fileid: @file ref
+);
+
+xmlChars(
+  unique int id: @xmlcharacters,
+  string text: string ref,
+  int parentid: @xmlparent ref,
+  int idx: int ref,
+  int isCDATA: int ref,
+  int fileid: @file ref
+);
+
+@xmlparent = @file | @xmlelement;
+@xmlnamespaceable = @xmlelement | @xmlattribute;
+
+xmllocations(
+  int xmlElement: @xmllocatable ref,
+  int location: @location_default ref
+);
+
+@xmllocatable = @xmlcharacters | @xmlelement | @xmlcomment | @xmlattribute | @xmldtd | @file | @xmlnamespace;
diff --git a/cpp/ql/lib/upgrades/1a6854060d5d3ada16c580a29f8c5ce21f3367f8/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/1a6854060d5d3ada16c580a29f8c5ce21f3367f8/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..a42ce5fc9432
--- /dev/null
+++ b/cpp/ql/lib/upgrades/1a6854060d5d3ada16c580a29f8c5ce21f3367f8/semmlecode.cpp.dbscheme
@@ -0,0 +1,2469 @@
+
+/*- 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             // _Decimal32
+| 41 = @decimal64             // _Decimal64
+| 42 = @decimal128            // _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @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
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 18 = @ppd_warning
+;
+
+@ppd_include = @ppd_plain_include | @ppd_objc_import | @ppd_include_next | @ppd_ms_import;
+
+@ppd_branch = @ppd_if | @ppd_ifdef | @ppd_ifndef | @ppd_elif | @ppd_elifdef | @ppd_elifndef;
+
+preprocpair(
+    int begin : @ppd_branch ref,
+    int elseelifend : @preprocdirect ref
+);
+
+preproctrue(int branch : @ppd_branch ref);
+preprocfalse(int branch : @ppd_branch ref);
+
+preproctext(
+    unique int id: @preprocdirect ref,
+    string head: string ref,
+    string body: string ref
+);
+
+includes(
+    unique int id: @ppd_include ref,
+    int included: @file ref
+);
+
+link_targets(
+    int id: @link_target,
+    int binary: @file ref
+);
+
+link_parent(
+    int element : @element ref,
+    int link_target : @link_target ref
+);
+
+/**
+ * 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
+);
+
+/**
+ * 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/1a6854060d5d3ada16c580a29f8c5ce21f3367f8/upgrade.properties b/cpp/ql/lib/upgrades/1a6854060d5d3ada16c580a29f8c5ce21f3367f8/upgrade.properties
new file mode 100644
index 000000000000..52b67d65af75
--- /dev/null
+++ b/cpp/ql/lib/upgrades/1a6854060d5d3ada16c580a29f8c5ce21f3367f8/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add databaseMetadata and overlayChangedFiles relations
+compatibility: full