diff --git a/cpp/downgrades/1402ab319d20cdc9289deb7bfc1c70f36be44d44/exprs.ql b/cpp/downgrades/1402ab319d20cdc9289deb7bfc1c70f36be44d44/exprs.ql
new file mode 100644
index 000000000000..661e16804565
--- /dev/null
+++ b/cpp/downgrades/1402ab319d20cdc9289deb7bfc1c70f36be44d44/exprs.ql
@@ -0,0 +1,17 @@
+class Expr extends @expr {
+  string toString() { none() }
+}
+
+class Location extends @location_default {
+  string toString() { none() }
+}
+
+predicate isExprWithNewBuiltin(Expr expr) {
+  exists(int kind | exprs(expr, kind, _) | 394 <= kind and kind <= 396)
+}
+
+from Expr expr, int kind, int kind_new, Location location
+where
+  exprs(expr, kind, location) and
+  if isExprWithNewBuiltin(expr) then kind_new = 1 else kind_new = kind
+select expr, kind_new, location
diff --git a/cpp/downgrades/1402ab319d20cdc9289deb7bfc1c70f36be44d44/old.dbscheme b/cpp/downgrades/1402ab319d20cdc9289deb7bfc1c70f36be44d44/old.dbscheme
new file mode 100644
index 000000000000..1402ab319d20
--- /dev/null
+++ b/cpp/downgrades/1402ab319d20cdc9289deb7bfc1c70f36be44d44/old.dbscheme
@@ -0,0 +1,2479 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 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/1402ab319d20cdc9289deb7bfc1c70f36be44d44/semmlecode.cpp.dbscheme b/cpp/downgrades/1402ab319d20cdc9289deb7bfc1c70f36be44d44/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..d2d611b3fdcc
--- /dev/null
+++ b/cpp/downgrades/1402ab319d20cdc9289deb7bfc1c70f36be44d44/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
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@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/1402ab319d20cdc9289deb7bfc1c70f36be44d44/upgrade.properties b/cpp/downgrades/1402ab319d20cdc9289deb7bfc1c70f36be44d44/upgrade.properties
new file mode 100644
index 000000000000..08afc1981d7e
--- /dev/null
+++ b/cpp/downgrades/1402ab319d20cdc9289deb7bfc1c70f36be44d44/upgrade.properties
@@ -0,0 +1,4 @@
+description: Add new builtin operations and this parameter access table
+compatibility: partial
+exprs.rel: run exprs.qlo
+param_ref_to_this.rel: delete
diff --git a/cpp/ql/lib/change-notes/2026-01-09-builtins.md b/cpp/ql/lib/change-notes/2026-01-09-builtins.md
new file mode 100644
index 000000000000..ece5fba5de65
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2026-01-09-builtins.md
@@ -0,0 +1,4 @@
+---
+category: feature
+---
+* Added subclasses of `BuiltInOperations` for the `__is_bitwise_cloneable`, `__is_invocable`, and `__is_nothrow_invocable` builtin operations.
diff --git a/cpp/ql/lib/change-notes/2026-01-09-this-access.md b/cpp/ql/lib/change-notes/2026-01-09-this-access.md
new file mode 100644
index 000000000000..e0934d8926b1
--- /dev/null
+++ b/cpp/ql/lib/change-notes/2026-01-09-this-access.md
@@ -0,0 +1,4 @@
+---
+category: feature
+---
+* Added a `isThisAccess` predicate to `ParamAccessForType` that holds when the access is to the implicit object parameter.
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/Access.qll b/cpp/ql/lib/semmle/code/cpp/exprs/Access.qll
index 333493e6f5d6..d181299f2ffc 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/Access.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/Access.qll
@@ -394,6 +394,11 @@ class FunctionAccess extends Access, @routineexpr {
  */
 class ParamAccessForType extends Expr, @param_ref {
   override string toString() { result = "param access" }
+
+  /**
+   * Holds if the accessed parameter is implicit object parameter of the function.
+   */
+  predicate isThisAccess() { param_ref_to_this(underlyingElement(this)) }
 }
 
 /**
diff --git a/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll b/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll
index dc55bcda9e65..2246a887b9c1 100644
--- a/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll
+++ b/cpp/ql/lib/semmle/code/cpp/exprs/BuiltInOperations.qll
@@ -1941,3 +1941,61 @@ class BuiltInOperationIsTriviallyRelocatable extends BuiltInOperation, @istrivia
 
   override string getAPrimaryQlClass() { result = "BuiltInOperationIsTriviallyRelocatable" }
 }
+
+/**
+ * A C++ `__is_bitwise_cloneable` built-in operation.
+ *
+ * Returns `true` if an object of type `_Tp` is bitwise cloneable.
+ *
+ * ```
+ * template<typename _Tp>
+ *   struct is_bitwise_cloneable
+ *   : public integral_constant<bool, __is_bitwise_cloneable(_Tp)>
+ *   {};
+ * ```
+ */
+class BuiltInOperationIsBitwiseCloneable extends BuiltInOperation, @isbitwisecloneable {
+  override string toString() { result = "__is_bitwise_cloneable" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationIsBitwiseCloneable" }
+}
+
+/**
+ * A C++ `__is_invocable` built-in operation (used by some implementations
+ * of the `<type_traits>` header).
+ *
+ * Returns `true` if a function of type `_FTpn` can be invoked with arguments of
+ * type `_Tps`.
+ *
+ * ```
+ * template<typename _FTpn, typename... _Tps>
+ *   struct is_invocable
+ *   : public integral_constant<bool, __is_invocable(_FTpn, _Tps...)>
+ *   {};
+ * ```
+ */
+class BuiltInOperationIsInvocable extends BuiltInOperation, @isinvocable {
+  override string toString() { result = "__is_invocable" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationIsInvocable" }
+}
+
+/**
+ * A C++ `__is_nothrow_invocable` built-in operation (used by some implementations
+ * of the `<type_traits>` header).
+ *
+ * Returns `true` if a function of non-throwing type `_FTpn` can be invoked
+ * with arguments of type `_Tps`.
+ *
+ * ```
+ * template<typename _FTpn, typename... _Tps>
+ *   struct is_nothrow_invocable
+ *   : public integral_constant<bool, __is_nothrow_invocable(_FTpn, _Tps...)>
+ *   {};
+ * ```
+ */
+class BuiltInOperationIsNothrowInvocable extends BuiltInOperation, @isnothrowinvocable {
+  override string toString() { result = "__is_nothrow_invocable" }
+
+  override string getAPrimaryQlClass() { result = "BuiltInOperationIsNothrowInvocable" }
+}
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme b/cpp/ql/lib/semmlecode.cpp.dbscheme
index d2d611b3fdcc..1402ab319d20 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme
@@ -1902,6 +1902,9 @@ case @expr.kind of
 | 391 = @nested_requirement
 | 392 = @compound_requirement
 | 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
 ;
 
 @var_args_expr = @vastartexpr
@@ -2018,6 +2021,9 @@ case @expr.kind of
             | @istriviallyequalitycomparable
             | @isscopedenum
             | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
             ;
 
 compound_requirement_is_noexcept(
@@ -2034,6 +2040,10 @@ new_array_allocated_type(
     int type_id: @type ref
 );
 
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
 /**
  * The field being initialized by an initializer expression within an aggregate
  * initializer for a class/struct/union. Position is used to sort repeated initializers.
diff --git a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
index 541a5f64b779..eca8a306a7c2 100644
--- a/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
+++ b/cpp/ql/lib/semmlecode.cpp.dbscheme.stats
@@ -22,7 +22,7 @@
         </e>
         <e>
             <k>@location_default</k>
-            <v>46837418</v>
+            <v>46837431</v>
         </e>
         <e>
             <k>@pch</k>
@@ -30,7 +30,7 @@
         </e>
         <e>
             <k>@macro_expansion</k>
-            <v>40306114</v>
+            <v>40306125</v>
         </e>
         <e>
             <k>@other_macro_reference</k>
@@ -38,7 +38,7 @@
         </e>
         <e>
             <k>@normal_function</k>
-            <v>2734630</v>
+            <v>2734631</v>
         </e>
         <e>
             <k>@unknown_function</k>
@@ -46,7 +46,7 @@
         </e>
         <e>
             <k>@constructor</k>
-            <v>694355</v>
+            <v>694346</v>
         </e>
         <e>
             <k>@destructor</k>
@@ -70,11 +70,11 @@
         </e>
         <e>
             <k>@fun_decl</k>
-            <v>4193414</v>
+            <v>4194038</v>
         </e>
         <e>
             <k>@var_decl</k>
-            <v>9367981</v>
+            <v>9368606</v>
         </e>
         <e>
             <k>@type_decl</k>
@@ -86,7 +86,7 @@
         </e>
         <e>
             <k>@using_declaration</k>
-            <v>266984</v>
+            <v>266867</v>
         </e>
         <e>
             <k>@using_directive</k>
@@ -98,11 +98,11 @@
         </e>
         <e>
             <k>@static_assert</k>
-            <v>172749</v>
+            <v>172750</v>
         </e>
         <e>
             <k>@parameter</k>
-            <v>7011799</v>
+            <v>7011800</v>
         </e>
         <e>
             <k>@membervariable</k>
@@ -110,11 +110,11 @@
         </e>
         <e>
             <k>@globalvariable</k>
-            <v>492566</v>
+            <v>492567</v>
         </e>
         <e>
             <k>@localvariable</k>
-            <v>724687</v>
+            <v>724728</v>
         </e>
         <e>
             <k>@enumconstant</k>
@@ -354,7 +354,7 @@
         </e>
         <e>
             <k>@pointer</k>
-            <v>451498</v>
+            <v>451499</v>
         </e>
         <e>
             <k>@type_with_specifiers</k>
@@ -366,7 +366,7 @@
         </e>
         <e>
             <k>@routineptr</k>
-            <v>679868</v>
+            <v>679859</v>
         </e>
         <e>
             <k>@reference</k>
@@ -392,10 +392,6 @@
             <k>@scalable_vector</k>
             <v>1</v>
         </e>
-        <e>
-            <k>@decltype</k>
-            <v>101757</v>
-        </e>
         <e>
             <k>@typeof</k>
             <v>811</v>
@@ -476,9 +472,13 @@
             <k>@remove_reference</k>
             <v>5706</v>
         </e>
+        <e>
+            <k>@decltype</k>
+            <v>101757</v>
+        </e>
         <e>
             <k>@struct</k>
-            <v>976646</v>
+            <v>976642</v>
         </e>
         <e>
             <k>@union</k>
@@ -490,11 +490,11 @@
         </e>
         <e>
             <k>@template_parameter</k>
-            <v>864462</v>
+            <v>864458</v>
         </e>
         <e>
             <k>@alias</k>
-            <v>1755835</v>
+            <v>1755826</v>
         </e>
         <e>
             <k>@unknown_usertype</k>
@@ -506,7 +506,7 @@
         </e>
         <e>
             <k>@template_template_parameter</k>
-            <v>6091</v>
+            <v>6090</v>
         </e>
         <e>
             <k>@proxy_class</k>
@@ -518,7 +518,7 @@
         </e>
         <e>
             <k>@template_struct</k>
-            <v>211187</v>
+            <v>211186</v>
         </e>
         <e>
             <k>@template_class</k>
@@ -530,11 +530,11 @@
         </e>
         <e>
             <k>@mangledname</k>
-            <v>6349608</v>
+            <v>6349610</v>
         </e>
         <e>
             <k>@type_mention</k>
-            <v>5911108</v>
+            <v>5911109</v>
         </e>
         <e>
             <k>@concept_template</k>
@@ -542,7 +542,7 @@
         </e>
         <e>
             <k>@routinetype</k>
-            <v>600596</v>
+            <v>600588</v>
         </e>
         <e>
             <k>@ptrtomember</k>
@@ -578,7 +578,7 @@
         </e>
         <e>
             <k>@attribute_arg_constant_expr</k>
-            <v>71524</v>
+            <v>71640</v>
         </e>
         <e>
             <k>@attribute_arg_expr</k>
@@ -598,15 +598,15 @@
         </e>
         <e>
             <k>@derivation</k>
-            <v>473802</v>
+            <v>473796</v>
         </e>
         <e>
             <k>@frienddecl</k>
-            <v>695912</v>
+            <v>695869</v>
         </e>
         <e>
             <k>@comment</k>
-            <v>11208574</v>
+            <v>11208577</v>
         </e>
         <e>
             <k>@namespace</k>
@@ -622,11 +622,11 @@
         </e>
         <e>
             <k>@value</k>
-            <v>13541399</v>
+            <v>13541403</v>
         </e>
         <e>
             <k>@initialiser</k>
-            <v>2244826</v>
+            <v>2244827</v>
         </e>
         <e>
             <k>@address_of</k>
@@ -642,7 +642,7 @@
         </e>
         <e>
             <k>@parexpr</k>
-            <v>4915710</v>
+            <v>4915712</v>
         </e>
         <e>
             <k>@arithnegexpr</k>
@@ -650,7 +650,7 @@
         </e>
         <e>
             <k>@unaryplusexpr</k>
-            <v>4060</v>
+            <v>4061</v>
         </e>
         <e>
             <k>@complementexpr</k>
@@ -678,11 +678,11 @@
         </e>
         <e>
             <k>@conditionalexpr</k>
-            <v>897971</v>
+            <v>897972</v>
         </e>
         <e>
             <k>@addexpr</k>
-            <v>580446</v>
+            <v>580447</v>
         </e>
         <e>
             <k>@subexpr</k>
@@ -722,7 +722,7 @@
         </e>
         <e>
             <k>@andexpr</k>
-            <v>483234</v>
+            <v>483235</v>
         </e>
         <e>
             <k>@orexpr</k>
@@ -734,7 +734,7 @@
         </e>
         <e>
             <k>@eqexpr</k>
-            <v>643439</v>
+            <v>643440</v>
         </e>
         <e>
             <k>@neexpr</k>
@@ -758,7 +758,7 @@
         </e>
         <e>
             <k>@assignexpr</k>
-            <v>1281279</v>
+            <v>1281280</v>
         </e>
         <e>
             <k>@assignaddexpr</k>
@@ -818,7 +818,7 @@
         </e>
         <e>
             <k>@commaexpr</k>
-            <v>167880</v>
+            <v>167881</v>
         </e>
         <e>
             <k>@subscriptexpr</k>
@@ -826,7 +826,7 @@
         </e>
         <e>
             <k>@callexpr</k>
-            <v>238864</v>
+            <v>238861</v>
         </e>
         <e>
             <k>@vastartexpr</k>
@@ -846,7 +846,7 @@
         </e>
         <e>
             <k>@varaccess</k>
-            <v>8255500</v>
+            <v>8255502</v>
         </e>
         <e>
             <k>@runtime_sizeof</k>
@@ -854,7 +854,7 @@
         </e>
         <e>
             <k>@runtime_alignof</k>
-            <v>49553</v>
+            <v>49552</v>
         </e>
         <e>
             <k>@expr_stmt</k>
@@ -862,7 +862,7 @@
         </e>
         <e>
             <k>@routineexpr</k>
-            <v>5726205</v>
+            <v>5726207</v>
         </e>
         <e>
             <k>@type_operand</k>
@@ -878,7 +878,7 @@
         </e>
         <e>
             <k>@literal</k>
-            <v>7984513</v>
+            <v>7984746</v>
         </e>
         <e>
             <k>@aggregateliteral</k>
@@ -890,7 +890,7 @@
         </e>
         <e>
             <k>@temp_init</k>
-            <v>980435</v>
+            <v>980663</v>
         </e>
         <e>
             <k>@errorexpr</k>
@@ -898,15 +898,15 @@
         </e>
         <e>
             <k>@reference_to</k>
-            <v>1880596</v>
+            <v>1880187</v>
         </e>
         <e>
             <k>@ref_indirect</k>
-            <v>2094134</v>
+            <v>2094107</v>
         </e>
         <e>
             <k>@vacuous_destructor_call</k>
-            <v>7785</v>
+            <v>7784</v>
         </e>
         <e>
             <k>@assume</k>
@@ -962,7 +962,7 @@
         </e>
         <e>
             <k>@thisaccess</k>
-            <v>1553672</v>
+            <v>1553673</v>
         </e>
         <e>
             <k>@new_expr</k>
@@ -974,7 +974,7 @@
         </e>
         <e>
             <k>@throw_expr</k>
-            <v>23891</v>
+            <v>23840</v>
         </e>
         <e>
             <k>@condition_decl</k>
@@ -982,11 +982,11 @@
         </e>
         <e>
             <k>@braced_init_list</k>
-            <v>2125</v>
+            <v>2126</v>
         </e>
         <e>
             <k>@type_id</k>
-            <v>47590</v>
+            <v>47589</v>
         </e>
         <e>
             <k>@sizeof_pack</k>
@@ -1094,11 +1094,11 @@
         </e>
         <e>
             <k>@ctordirectinit</k>
-            <v>112104</v>
+            <v>112102</v>
         </e>
         <e>
             <k>@ctorvirtualinit</k>
-            <v>3994</v>
+            <v>3993</v>
         </e>
         <e>
             <k>@ctorfieldinit</k>
@@ -1118,7 +1118,7 @@
         </e>
         <e>
             <k>@dtorfielddestruct</k>
-            <v>39568</v>
+            <v>39567</v>
         </e>
         <e>
             <k>@static_cast</k>
@@ -1142,7 +1142,7 @@
         </e>
         <e>
             <k>@param_ref</k>
-            <v>162117</v>
+            <v>162180</v>
         </e>
         <e>
             <k>@noopexpr</k>
@@ -1174,7 +1174,7 @@
         </e>
         <e>
             <k>@istrivialexpr</k>
-            <v>3327</v>
+            <v>3328</v>
         </e>
         <e>
             <k>@isstandardlayoutexpr</k>
@@ -1242,11 +1242,11 @@
         </e>
         <e>
             <k>@isfinalexpr</k>
-            <v>9342</v>
+            <v>9341</v>
         </e>
         <e>
             <k>@noexceptexpr</k>
-            <v>28127</v>
+            <v>28138</v>
         </e>
         <e>
             <k>@builtinshufflevector</k>
@@ -1532,6 +1532,18 @@
             <k>@concept_id</k>
             <v>90160</v>
         </e>
+        <e>
+            <k>@isinvocable</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@isnothrowinvocable</k>
+            <v>2</v>
+        </e>
+        <e>
+            <k>@isbitwisecloneable</k>
+            <v>2</v>
+        </e>
         <e>
             <k>@lambdacapture</k>
             <v>31866</v>
@@ -1542,7 +1554,7 @@
         </e>
         <e>
             <k>@stmt_if</k>
-            <v>990318</v>
+            <v>990319</v>
         </e>
         <e>
             <k>@stmt_while</k>
@@ -1550,7 +1562,7 @@
         </e>
         <e>
             <k>@stmt_goto</k>
-            <v>157272</v>
+            <v>157271</v>
         </e>
         <e>
             <k>@stmt_label</k>
@@ -1558,7 +1570,7 @@
         </e>
         <e>
             <k>@stmt_return</k>
-            <v>1238182</v>
+            <v>1238155</v>
         </e>
         <e>
             <k>@stmt_block</k>
@@ -1586,11 +1598,11 @@
         </e>
         <e>
             <k>@stmt_decl</k>
-            <v>770029</v>
+            <v>770030</v>
         </e>
         <e>
             <k>@stmt_empty</k>
-            <v>428127</v>
+            <v>428128</v>
         </e>
         <e>
             <k>@stmt_continue</k>
@@ -1602,7 +1614,7 @@
         </e>
         <e>
             <k>@stmt_try_block</k>
-            <v>26422</v>
+            <v>26372</v>
         </e>
         <e>
             <k>@stmt_microsoft_try</k>
@@ -1622,11 +1634,11 @@
         </e>
         <e>
             <k>@stmt_range_based_for</k>
-            <v>6308</v>
+            <v>6311</v>
         </e>
         <e>
             <k>@stmt_handler</k>
-            <v>43261</v>
+            <v>43218</v>
         </e>
         <e>
             <k>@stmt_constexpr_if</k>
@@ -1674,11 +1686,11 @@
         </e>
         <e>
             <k>@ppd_plain_include</k>
-            <v>317280</v>
+            <v>317278</v>
         </e>
         <e>
             <k>@ppd_define</k>
-            <v>2743341</v>
+            <v>2743342</v>
         </e>
         <e>
             <k>@ppd_undef</k>
@@ -1694,7 +1706,7 @@
         </e>
         <e>
             <k>@ppd_line</k>
-            <v>18770</v>
+            <v>18771</v>
         </e>
         <e>
             <k>@ppd_error</k>
@@ -1800,7 +1812,7 @@
         </relation>
         <relation>
             <name>compilation_args</name>
-            <cardinality>1008133</cardinality>
+            <cardinality>1008128</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -2171,7 +2183,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19304</v>
+                                    <v>19303</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2191,7 +2203,7 @@
         </relation>
         <relation>
             <name>compilation_expanded_args</name>
-            <cardinality>1008133</cardinality>
+            <cardinality>1008128</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -2562,7 +2574,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19304</v>
+                                    <v>19303</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -2892,7 +2904,7 @@
                 </e>
                 <e>
                     <k>seconds</k>
-                    <v>20423</v>
+                    <v>19606</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -2970,50 +2982,55 @@
                         <hist>
                             <budget>12</budget>
                             <bs>
+                                <b>
+                                    <a>2</a>
+                                    <b>3</b>
+                                    <v>54</v>
+                                </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>925</v>
+                                    <v>816</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>435</v>
+                                    <v>490</v>
                                 </b>
                                 <b>
-                                    <a>5</a>
-                                    <b>8</b>
+                                    <a>6</a>
+                                    <b>9</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>8</a>
+                                    <a>9</a>
                                     <b>10</b>
-                                    <v>108</v>
+                                    <v>217</v>
                                 </b>
                                 <b>
                                     <a>10</a>
-                                    <b>11</b>
-                                    <v>272</v>
+                                    <b>12</b>
+                                    <v>217</v>
                                 </b>
                                 <b>
-                                    <a>11</a>
-                                    <b>14</b>
-                                    <v>163</v>
+                                    <a>12</a>
+                                    <b>19</b>
+                                    <v>217</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>18</b>
+                                    <a>19</a>
+                                    <b>21</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>18</a>
-                                    <b>26</b>
+                                    <a>21</a>
+                                    <b>52</b>
                                     <v>217</v>
                                 </b>
                                 <b>
-                                    <a>45</a>
-                                    <b>128</b>
-                                    <v>163</v>
+                                    <a>125</a>
+                                    <b>126</b>
+                                    <v>54</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3081,41 +3098,41 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1524</v>
+                                    <v>925</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>871</v>
+                                    <v>1470</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
-                                    <v>108</v>
+                                    <v>326</v>
                                 </b>
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>599</v>
+                                    <v>435</v>
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>9</b>
-                                    <v>381</v>
+                                    <b>8</b>
+                                    <v>326</v>
                                 </b>
                                 <b>
-                                    <a>9</a>
+                                    <a>8</a>
                                     <b>10</b>
                                     <v>381</v>
                                 </b>
                                 <b>
                                     <a>11</a>
-                                    <b>27</b>
+                                    <b>28</b>
                                     <v>381</v>
                                 </b>
                                 <b>
                                     <a>30</a>
-                                    <b>96</b>
+                                    <b>98</b>
                                     <v>272</v>
                                 </b>
                             </bs>
@@ -3162,18 +3179,23 @@
                             <budget>12</budget>
                             <bs>
                                 <b>
-                                    <a>4</a>
-                                    <b>5</b>
-                                    <v>108</v>
+                                    <a>5</a>
+                                    <b>6</b>
+                                    <v>54</v>
                                 </b>
                                 <b>
-                                    <a>210</a>
-                                    <b>211</b>
+                                    <a>6</a>
+                                    <b>7</b>
                                     <v>54</v>
                                 </b>
                                 <b>
-                                    <a>214</a>
-                                    <b>215</b>
+                                    <a>204</a>
+                                    <b>205</b>
+                                    <v>54</v>
+                                </b>
+                                <b>
+                                    <a>205</a>
+                                    <b>206</b>
                                     <v>54</v>
                                 </b>
                             </bs>
@@ -3190,22 +3212,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>15249</v>
+                                    <v>13452</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3376</v>
+                                    <v>4574</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>6</b>
-                                    <v>1579</v>
+                                    <b>16</b>
+                                    <v>1470</v>
                                 </b>
                                 <b>
-                                    <a>10</a>
-                                    <b>39</b>
-                                    <v>217</v>
+                                    <a>33</a>
+                                    <b>38</b>
+                                    <v>108</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3221,22 +3243,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>14486</v>
+                                    <v>12852</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2995</v>
+                                    <v>3975</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>4</b>
-                                    <v>1579</v>
+                                    <b>5</b>
+                                    <v>1797</v>
                                 </b>
                                 <b>
-                                    <a>4</a>
-                                    <b>64</b>
-                                    <v>1361</v>
+                                    <a>5</a>
+                                    <b>66</b>
+                                    <v>980</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3252,12 +3274,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>17318</v>
+                                    <v>16392</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>3104</v>
+                                    <v>3158</v>
+                                </b>
+                                <b>
+                                    <a>3</a>
+                                    <b>4</b>
+                                    <v>54</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3541,7 +3568,7 @@
                 </e>
                 <e>
                     <k>cpu_seconds</k>
-                    <v>9509</v>
+                    <v>9373</v>
                 </e>
                 <e>
                     <k>elapsed_seconds</k>
@@ -3591,17 +3618,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8047</v>
+                                    <v>7868</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1115</v>
+                                    <v>1041</v>
                                 </b>
                                 <b>
                                     <a>3</a>
-                                    <b>34</b>
-                                    <v>347</v>
+                                    <b>30</b>
+                                    <v>462</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3617,12 +3644,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8868</v>
+                                    <v>8741</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>641</v>
+                                    <v>631</v>
                                 </b>
                             </bs>
                         </hist>
@@ -3638,61 +3665,71 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52</v>
+                                    <v>31</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21</v>
+                                    <v>42</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
                                     <v>10</v>
                                 </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>21</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>10</v>
+                                </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>52</v>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
+                                    <a>14</a>
+                                    <b>15</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>10</v>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>33</a>
-                                    <b>34</b>
+                                    <a>28</a>
+                                    <b>29</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>62</a>
-                                    <b>63</b>
+                                    <a>76</a>
+                                    <b>77</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>185</a>
-                                    <b>186</b>
+                                    <a>180</a>
+                                    <b>181</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>220</a>
-                                    <b>221</b>
+                                    <a>215</a>
+                                    <b>216</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>283</a>
-                                    <b>284</b>
+                                    <a>299</a>
+                                    <b>300</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>324</a>
-                                    <b>325</b>
+                                    <a>300</a>
+                                    <b>301</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -3709,61 +3746,71 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>52</v>
+                                    <v>31</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>21</v>
+                                    <v>42</v>
                                 </b>
                                 <b>
                                     <a>5</a>
                                     <b>6</b>
                                     <v>10</v>
                                 </b>
+                                <b>
+                                    <a>7</a>
+                                    <b>8</b>
+                                    <v>21</v>
+                                </b>
+                                <b>
+                                    <a>8</a>
+                                    <b>9</b>
+                                    <v>10</v>
+                                </b>
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>52</v>
+                                    <v>10</v>
                                 </b>
                                 <b>
-                                    <a>15</a>
-                                    <b>16</b>
+                                    <a>14</a>
+                                    <b>15</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>16</a>
-                                    <b>17</b>
-                                    <v>10</v>
+                                    <a>19</a>
+                                    <b>20</b>
+                                    <v>21</v>
                                 </b>
                                 <b>
-                                    <a>33</a>
-                                    <b>34</b>
+                                    <a>28</a>
+                                    <b>29</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>60</a>
-                                    <b>61</b>
+                                    <a>72</a>
+                                    <b>73</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>166</a>
-                                    <b>167</b>
+                                    <a>148</a>
+                                    <b>149</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>174</a>
-                                    <b>175</b>
+                                    <a>169</a>
+                                    <b>170</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>208</a>
-                                    <b>209</b>
+                                    <a>195</a>
+                                    <b>196</b>
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>234</a>
-                                    <b>235</b>
+                                    <a>240</a>
+                                    <b>241</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -4001,11 +4048,11 @@
         </relation>
         <relation>
             <name>locations_default</name>
-            <cardinality>46837418</cardinality>
+            <cardinality>46837431</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>46837418</v>
+                    <v>46837431</v>
                 </e>
                 <e>
                     <k>file</k>
@@ -4013,7 +4060,7 @@
                 </e>
                 <e>
                     <k>beginLine</k>
-                    <v>7483209</v>
+                    <v>7483211</v>
                 </e>
                 <e>
                     <k>beginColumn</k>
@@ -4021,7 +4068,7 @@
                 </e>
                 <e>
                     <k>endLine</k>
-                    <v>7484205</v>
+                    <v>7484207</v>
                 </e>
                 <e>
                     <k>endColumn</k>
@@ -4039,7 +4086,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837418</v>
+                                    <v>46837431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4055,7 +4102,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837418</v>
+                                    <v>46837431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4071,7 +4118,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837418</v>
+                                    <v>46837431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4087,7 +4134,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837418</v>
+                                    <v>46837431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4103,7 +4150,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>46837418</v>
+                                    <v>46837431</v>
                                 </b>
                             </bs>
                         </hist>
@@ -4504,12 +4551,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4945830</v>
+                                    <v>4945831</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>778673</v>
+                                    <v>778674</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -4524,7 +4571,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>96</b>
-                                    <v>561386</v>
+                                    <v>561387</v>
                                 </b>
                                 <b>
                                     <a>96</a>
@@ -4545,12 +4592,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5008054</v>
+                                    <v>5008055</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1216856</v>
+                                    <v>1216857</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -4581,12 +4628,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5629550</v>
+                                    <v>5629551</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>483108</v>
+                                    <v>483109</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -4596,7 +4643,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>25</b>
-                                    <v>564995</v>
+                                    <v>564996</v>
                                 </b>
                                 <b>
                                     <a>25</a>
@@ -4617,7 +4664,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7018145</v>
+                                    <v>7018147</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -4638,7 +4685,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5014276</v>
+                                    <v>5014278</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5059,7 +5106,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4943590</v>
+                                    <v>4943591</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5100,12 +5147,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5005067</v>
+                                    <v>5005069</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1220465</v>
+                                    <v>1220466</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -5136,7 +5183,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7035319</v>
+                                    <v>7035321</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5157,7 +5204,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5628181</v>
+                                    <v>5628182</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5193,7 +5240,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5012783</v>
+                                    <v>5012784</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -5213,7 +5260,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>72</b>
-                                    <v>561635</v>
+                                    <v>561636</v>
                                 </b>
                                 <b>
                                     <a>72</a>
@@ -7190,7 +7237,7 @@
         </relation>
         <relation>
             <name>fileannotations</name>
-            <cardinality>4183618</cardinality>
+            <cardinality>4183599</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -7202,7 +7249,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>58480</v>
+                    <v>58479</v>
                 </e>
                 <e>
                     <k>value</k>
@@ -7522,7 +7569,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58480</v>
+                                    <v>58479</v>
                                 </b>
                             </bs>
                         </hist>
@@ -7614,7 +7661,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>3177</v>
+                                    <v>3176</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -7731,7 +7778,7 @@
                                 <b>
                                     <a>14</a>
                                     <b>18</b>
-                                    <v>3440</v>
+                                    <v>3439</v>
                                 </b>
                                 <b>
                                     <a>18</a>
@@ -7781,15 +7828,15 @@
         </relation>
         <relation>
             <name>inmacroexpansion</name>
-            <cardinality>150011383</cardinality>
+            <cardinality>150011425</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>24673494</v>
+                    <v>24673501</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3705720</v>
+                    <v>3705721</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7803,12 +7850,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>3</b>
-                                    <v>2209721</v>
+                                    <v>2209722</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>1475128</v>
+                                    <v>1475129</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -7818,17 +7865,17 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>6583218</v>
+                                    <v>6583219</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>8</b>
-                                    <v>8719891</v>
+                                    <v>8719894</v>
                                 </b>
                                 <b>
                                     <a>8</a>
                                     <b>9</b>
-                                    <v>3557412</v>
+                                    <v>3557413</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -7854,7 +7901,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>743308</v>
+                                    <v>743309</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -7884,12 +7931,12 @@
                                 <b>
                                     <a>10</a>
                                     <b>11</b>
-                                    <v>444695</v>
+                                    <v>444696</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>337</b>
-                                    <v>307829</v>
+                                    <v>307830</v>
                                 </b>
                                 <b>
                                     <a>339</a>
@@ -7909,15 +7956,15 @@
         </relation>
         <relation>
             <name>affectedbymacroexpansion</name>
-            <cardinality>48740821</cardinality>
+            <cardinality>48740834</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7045462</v>
+                    <v>7045464</v>
                 </e>
                 <e>
                     <k>inv</k>
-                    <v>3803510</v>
+                    <v>3803511</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -7931,7 +7978,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3847104</v>
+                                    <v>3847105</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -7982,7 +8029,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>7</b>
-                                    <v>316639</v>
+                                    <v>316640</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -7992,7 +8039,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>12</b>
-                                    <v>342973</v>
+                                    <v>342974</v>
                                 </b>
                                 <b>
                                     <a>12</a>
@@ -8047,11 +8094,11 @@
         </relation>
         <relation>
             <name>macroinvocations</name>
-            <cardinality>40387480</cardinality>
+            <cardinality>40387491</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>40387480</v>
+                    <v>40387491</v>
                 </e>
                 <e>
                     <k>macro_id</k>
@@ -8059,7 +8106,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5925540</v>
+                    <v>5925542</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -8077,7 +8124,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40387480</v>
+                                    <v>40387491</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8093,7 +8140,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40387480</v>
+                                    <v>40387491</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8109,7 +8156,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>40387480</v>
+                                    <v>40387491</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8253,7 +8300,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5261598</v>
+                                    <v>5261599</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8279,7 +8326,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5903374</v>
+                                    <v>5903376</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8300,7 +8347,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5925540</v>
+                                    <v>5925542</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8373,15 +8420,15 @@
         </relation>
         <relation>
             <name>macroparent</name>
-            <cardinality>33684444</cardinality>
+            <cardinality>33684454</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>33684444</v>
+                    <v>33684454</v>
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>15941262</v>
+                    <v>15941267</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8395,7 +8442,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>33684444</v>
+                                    <v>33684454</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8411,7 +8458,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7815088</v>
+                                    <v>7815090</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8421,7 +8468,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4707395</v>
+                                    <v>4707397</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -8441,15 +8488,15 @@
         </relation>
         <relation>
             <name>macrolocationbind</name>
-            <cardinality>6022278</cardinality>
+            <cardinality>6022280</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4208237</v>
+                    <v>4208238</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2272394</v>
+                    <v>2272395</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8463,7 +8510,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3284816</v>
+                                    <v>3284817</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8478,7 +8525,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>5</b>
-                                    <v>412639</v>
+                                    <v>412640</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -8529,11 +8576,11 @@
         </relation>
         <relation>
             <name>macro_argument_unexpanded</name>
-            <cardinality>82172786</cardinality>
+            <cardinality>82172776</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26182328</v>
+                    <v>26182583</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -8541,7 +8588,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>341886</v>
+                    <v>341884</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8555,22 +8602,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9642934</v>
+                                    <v>9643267</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9734025</v>
+                                    <v>9733979</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4982774</v>
+                                    <v>4982750</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1822594</v>
+                                    <v>1822585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8586,22 +8633,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9824833</v>
+                                    <v>9825166</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9751541</v>
+                                    <v>9751495</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4826700</v>
+                                    <v>4826677</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1779252</v>
+                                    <v>1779244</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8626,7 +8673,7 @@
                                 </b>
                                 <b>
                                     <a>646904</a>
-                                    <b>2488838</b>
+                                    <b>2488874</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -8735,7 +8782,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>242199</v>
+                                    <v>242198</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -8755,11 +8802,11 @@
         </relation>
         <relation>
             <name>macro_argument_expanded</name>
-            <cardinality>82172786</cardinality>
+            <cardinality>82172776</cardinality>
             <columnsizes>
                 <e>
                     <k>invocation</k>
-                    <v>26182328</v>
+                    <v>26182583</v>
                 </e>
                 <e>
                     <k>argument_index</k>
@@ -8767,7 +8814,7 @@
                 </e>
                 <e>
                     <k>text</k>
-                    <v>207063</v>
+                    <v>207062</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -8781,22 +8828,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9642934</v>
+                                    <v>9643267</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>9734025</v>
+                                    <v>9733979</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4982774</v>
+                                    <v>4982750</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>67</b>
-                                    <v>1822594</v>
+                                    <v>1822585</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8812,22 +8859,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>12590853</v>
+                                    <v>12591172</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>8396588</v>
+                                    <v>8396548</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4208487</v>
+                                    <v>4208468</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>986398</v>
+                                    <v>986394</v>
                                 </b>
                             </bs>
                         </hist>
@@ -8852,7 +8899,7 @@
                                 </b>
                                 <b>
                                     <a>646904</a>
-                                    <b>2488838</b>
+                                    <b>2488874</b>
                                     <v>31</v>
                                 </b>
                             </bs>
@@ -8900,7 +8947,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>26752</v>
+                                    <v>26751</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -8930,7 +8977,7 @@
                                 <b>
                                     <a>10</a>
                                     <b>19</b>
-                                    <v>18252</v>
+                                    <v>18251</v>
                                 </b>
                                 <b>
                                     <a>19</a>
@@ -8944,7 +8991,7 @@
                                 </b>
                                 <b>
                                     <a>251</a>
-                                    <b>1169569</b>
+                                    <b>1169605</b>
                                     <v>9467</v>
                                 </b>
                             </bs>
@@ -8981,11 +9028,11 @@
         </relation>
         <relation>
             <name>functions</name>
-            <cardinality>4043205</cardinality>
+            <cardinality>4043206</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4043205</v>
+                    <v>4043206</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -9007,7 +9054,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4043205</v>
+                                    <v>4043206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9023,7 +9070,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4043205</v>
+                                    <v>4043206</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9039,7 +9086,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1441361</v>
+                                    <v>1441362</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9065,7 +9112,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1686400</v>
+                                    <v>1686401</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9183,15 +9230,15 @@
         </relation>
         <relation>
             <name>function_entry_point</name>
-            <cardinality>1134682</cardinality>
+            <cardinality>1134667</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1130959</v>
+                    <v>1130944</v>
                 </e>
                 <e>
                     <k>entry_point</k>
-                    <v>1134682</v>
+                    <v>1134667</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9205,7 +9252,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1127777</v>
+                                    <v>1127762</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9226,7 +9273,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1134682</v>
+                                    <v>1134667</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9236,11 +9283,11 @@
         </relation>
         <relation>
             <name>function_return_type</name>
-            <cardinality>4060504</cardinality>
+            <cardinality>4060505</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4043205</v>
+                    <v>4043206</v>
                 </e>
                 <e>
                     <k>return_type</k>
@@ -9258,7 +9305,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4025907</v>
+                                    <v>4025908</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9612,11 +9659,11 @@
         </relation>
         <relation>
             <name>function_prototyped</name>
-            <cardinality>4041712</cardinality>
+            <cardinality>4041713</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4041712</v>
+                    <v>4041713</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -9774,15 +9821,15 @@
         </relation>
         <relation>
             <name>fun_decls</name>
-            <cardinality>4199388</cardinality>
+            <cardinality>4200011</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4193414</v>
+                    <v>4194038</v>
                 </e>
                 <e>
                     <k>function</k>
-                    <v>4018689</v>
+                    <v>4018690</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -9790,11 +9837,11 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1687769</v>
+                    <v>1687770</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2806436</v>
+                    <v>2806437</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -9808,7 +9855,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4193414</v>
+                                    <v>4194038</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9824,7 +9871,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4187441</v>
+                                    <v>4188064</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9845,7 +9892,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4193414</v>
+                                    <v>4194038</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9861,7 +9908,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4193414</v>
+                                    <v>4194038</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9877,12 +9924,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3858524</v>
+                                    <v>3857903</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>160165</v>
+                                    <v>160787</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9898,7 +9945,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4000395</v>
+                                    <v>4000396</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -9919,7 +9966,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4018689</v>
+                                    <v>4018690</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9935,12 +9982,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3878435</v>
+                                    <v>3878312</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>140253</v>
+                                    <v>140377</v>
                                 </b>
                             </bs>
                         </hist>
@@ -9966,7 +10013,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>5</b>
-                                    <v>48285</v>
+                                    <v>48286</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -9975,7 +10022,7 @@
                                 </b>
                                 <b>
                                     <a>364</a>
-                                    <b>10294</b>
+                                    <b>10299</b>
                                     <v>1244</v>
                                 </b>
                             </bs>
@@ -10028,7 +10075,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>490326</v>
+                                    <v>490327</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10090,22 +10137,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1328362</v>
+                                    <v>1328114</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>193392</v>
+                                    <v>193641</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>11</b>
-                                    <v>129550</v>
+                                    <v>129426</v>
                                 </b>
                                 <b>
                                     <a>11</a>
                                     <b>3169</b>
-                                    <v>36463</v>
+                                    <v>36587</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10147,7 +10194,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1598166</v>
+                                    <v>1598167</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10194,12 +10241,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2413304</v>
+                                    <v>2413180</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>252008</v>
+                                    <v>252132</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10220,12 +10267,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2431971</v>
+                                    <v>2431847</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>233838</v>
+                                    <v>233963</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -10246,7 +10293,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2692317</v>
+                                    <v>2692318</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10282,11 +10329,11 @@
         </relation>
         <relation>
             <name>fun_def</name>
-            <cardinality>1418836</cardinality>
+            <cardinality>1418837</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1418836</v>
+                    <v>1418837</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -10315,7 +10362,7 @@
         </relation>
         <relation>
             <name>fun_decl_specifiers</name>
-            <cardinality>4269577</cardinality>
+            <cardinality>4269578</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
@@ -10347,7 +10394,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1097510</v>
+                                    <v>1097511</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -10560,15 +10607,15 @@
         </relation>
         <relation>
             <name>fun_decl_noexcept</name>
-            <cardinality>140908</cardinality>
+            <cardinality>140906</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>140908</v>
+                    <v>140906</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>140468</v>
+                    <v>140466</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10582,7 +10629,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>140908</v>
+                                    <v>140906</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10598,7 +10645,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>140028</v>
+                                    <v>140026</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -10613,11 +10660,11 @@
         </relation>
         <relation>
             <name>fun_decl_empty_noexcept</name>
-            <cardinality>1160855</cardinality>
+            <cardinality>1160979</cardinality>
             <columnsizes>
                 <e>
                     <k>fun_decl</k>
-                    <v>1160855</v>
+                    <v>1160979</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -10883,11 +10930,11 @@
         </relation>
         <relation>
             <name>param_decl_bind</name>
-            <cardinality>7294670</cardinality>
+            <cardinality>7295294</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7294670</v>
+                    <v>7295294</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -10895,7 +10942,7 @@
                 </e>
                 <e>
                     <k>fun_decl</k>
-                    <v>3524006</v>
+                    <v>3524381</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -10909,7 +10956,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7294670</v>
+                                    <v>7295294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10925,7 +10972,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7294670</v>
+                                    <v>7295294</v>
                                 </b>
                             </bs>
                         </hist>
@@ -10960,12 +11007,12 @@
                                 </b>
                                 <b>
                                     <a>343</a>
-                                    <b>16218</b>
+                                    <b>16219</b>
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>28317</a>
-                                    <b>28318</b>
+                                    <a>28320</a>
+                                    <b>28321</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -11001,12 +11048,12 @@
                                 </b>
                                 <b>
                                     <a>343</a>
-                                    <b>16218</b>
+                                    <b>16219</b>
                                     <v>622</v>
                                 </b>
                                 <b>
-                                    <a>28317</a>
-                                    <b>28318</b>
+                                    <a>28320</a>
+                                    <b>28321</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -11023,7 +11070,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1505826</v>
+                                    <v>1506075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11033,7 +11080,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>600712</v>
+                                    <v>600837</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -11059,7 +11106,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1505826</v>
+                                    <v>1506075</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11069,7 +11116,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>600712</v>
+                                    <v>600837</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -11089,19 +11136,19 @@
         </relation>
         <relation>
             <name>var_decls</name>
-            <cardinality>9374452</cardinality>
+            <cardinality>9375077</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9367981</v>
+                    <v>9368606</v>
                 </e>
                 <e>
                     <k>variable</k>
-                    <v>9027366</v>
+                    <v>9027368</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1452935</v>
+                    <v>1452936</v>
                 </e>
                 <e>
                     <k>name</k>
@@ -11109,7 +11156,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>6259508</v>
+                    <v>6259509</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11123,7 +11170,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9367981</v>
+                                    <v>9368606</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11139,7 +11186,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9361510</v>
+                                    <v>9362135</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11160,7 +11207,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9367981</v>
+                                    <v>9368606</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11176,7 +11223,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9367981</v>
+                                    <v>9368606</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11192,12 +11239,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8704173</v>
+                                    <v>8703553</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>323192</v>
+                                    <v>323814</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11213,7 +11260,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8974351</v>
+                                    <v>8974353</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11234,7 +11281,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8922207</v>
+                                    <v>8922209</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11255,12 +11302,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8783073</v>
+                                    <v>8782702</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>244292</v>
+                                    <v>244665</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11439,7 +11486,7 @@
                                 </b>
                                 <b>
                                     <a>25</a>
-                                    <b>27137</b>
+                                    <b>27139</b>
                                     <v>31236</v>
                                 </b>
                             </bs>
@@ -11564,16 +11611,16 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5758603</v>
+                                    <v>5758231</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>20</b>
-                                    <v>470788</v>
+                                    <v>471161</v>
                                 </b>
                                 <b>
                                     <a>20</a>
-                                    <b>2941</b>
+                                    <b>2943</b>
                                     <v>30116</v>
                                 </b>
                             </bs>
@@ -11590,12 +11637,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5839245</v>
+                                    <v>5838874</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>2935</b>
-                                    <v>420262</v>
+                                    <v>420635</v>
                                 </b>
                             </bs>
                         </hist>
@@ -11611,7 +11658,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5961703</v>
+                                    <v>5961704</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11632,7 +11679,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6247187</v>
+                                    <v>6247189</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -11647,11 +11694,11 @@
         </relation>
         <relation>
             <name>var_def</name>
-            <cardinality>3763196</cardinality>
+            <cardinality>3763197</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3763196</v>
+                    <v>3763197</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -11809,11 +11856,11 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1610611</v>
+                    <v>1610612</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>1543658</v>
+                    <v>1543659</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -11922,7 +11969,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1521755</v>
+                                    <v>1521756</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12398,15 +12445,15 @@
         </relation>
         <relation>
             <name>usings</name>
-            <cardinality>271118</cardinality>
+            <cardinality>271001</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>271118</v>
+                    <v>271001</v>
                 </e>
                 <e>
                     <k>element_id</k>
-                    <v>58943</v>
+                    <v>58827</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -12428,7 +12475,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>271118</v>
+                                    <v>271001</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12444,7 +12491,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>271118</v>
+                                    <v>271001</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12460,7 +12507,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>271118</v>
+                                    <v>271001</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12476,7 +12523,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51242</v>
+                                    <v>51126</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12502,7 +12549,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>51242</v>
+                                    <v>51126</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12528,7 +12575,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>58943</v>
+                                    <v>58827</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12549,16 +12596,16 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2293</v>
+                                    <v>2282</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1935</v>
+                                    <v>1946</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>371</b>
+                                    <b>367</b>
                                     <v>1420</v>
                                 </b>
                             </bs>
@@ -12580,16 +12627,16 @@
                                 <b>
                                     <a>2</a>
                                     <b>4</b>
-                                    <v>2293</v>
+                                    <v>2282</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>132</b>
-                                    <v>1935</v>
+                                    <v>1946</v>
                                 </b>
                                 <b>
                                     <a>145</a>
-                                    <b>371</b>
+                                    <b>367</b>
                                     <v>1420</v>
                                 </b>
                             </bs>
@@ -12625,8 +12672,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>25379</a>
-                                    <b>25380</b>
+                                    <a>25368</a>
+                                    <b>25369</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -12646,8 +12693,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>5389</a>
-                                    <b>5390</b>
+                                    <a>5378</a>
+                                    <b>5379</b>
                                     <v>10</v>
                                 </b>
                             </bs>
@@ -12679,15 +12726,15 @@
         </relation>
         <relation>
             <name>using_container</name>
-            <cardinality>577953</cardinality>
+            <cardinality>577834</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
-                    <v>21828</v>
+                    <v>21807</v>
                 </e>
                 <e>
                     <k>child</k>
-                    <v>271118</v>
+                    <v>271001</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -12716,7 +12763,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>7</b>
-                                    <v>2303</v>
+                                    <v>2282</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -12752,7 +12799,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>96341</v>
+                                    <v>96225</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -12782,15 +12829,15 @@
         </relation>
         <relation>
             <name>static_asserts</name>
-            <cardinality>172749</cardinality>
+            <cardinality>172750</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>172749</v>
+                    <v>172750</v>
                 </e>
                 <e>
                     <k>condition</k>
-                    <v>172749</v>
+                    <v>172750</v>
                 </e>
                 <e>
                     <k>message</k>
@@ -12816,7 +12863,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12832,7 +12879,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12848,7 +12895,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12864,7 +12911,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12880,7 +12927,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12896,7 +12943,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12912,7 +12959,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -12928,7 +12975,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>172749</v>
+                                    <v>172750</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13390,11 +13437,11 @@
         </relation>
         <relation>
             <name>params</name>
-            <cardinality>7052244</cardinality>
+            <cardinality>7052246</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7011799</v>
+                    <v>7011800</v>
                 </e>
                 <e>
                     <k>function</k>
@@ -13406,7 +13453,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1217354</v>
+                    <v>1217355</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -13420,7 +13467,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7011799</v>
+                                    <v>7011800</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13436,7 +13483,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7011799</v>
+                                    <v>7011800</v>
                                 </b>
                             </bs>
                         </hist>
@@ -13452,7 +13499,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6971353</v>
+                                    <v>6971355</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13735,7 +13782,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>817501</v>
+                                    <v>817502</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -13881,7 +13928,7 @@
                 </e>
                 <e>
                     <k>name</k>
-                    <v>642756</v>
+                    <v>642757</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14045,11 +14092,11 @@
         </relation>
         <relation>
             <name>globalvariables</name>
-            <cardinality>492566</cardinality>
+            <cardinality>492567</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>492566</v>
+                    <v>492567</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -14071,7 +14118,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492566</v>
+                                    <v>492567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14087,7 +14134,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>492566</v>
+                                    <v>492567</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14231,19 +14278,19 @@
         </relation>
         <relation>
             <name>localvariables</name>
-            <cardinality>724687</cardinality>
+            <cardinality>724728</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>724687</v>
+                    <v>724728</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>53297</v>
+                    <v>53300</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>101408</v>
+                    <v>101414</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -14257,7 +14304,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724687</v>
+                                    <v>724728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14273,7 +14320,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>724687</v>
+                                    <v>724728</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14289,7 +14336,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>28788</v>
+                                    <v>28790</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14299,12 +14346,12 @@
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>4020</v>
+                                    <v>4021</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>6</b>
-                                    <v>4060</v>
+                                    <v>4061</v>
                                 </b>
                                 <b>
                                     <a>6</a>
@@ -14314,7 +14361,7 @@
                                 <b>
                                     <a>12</a>
                                     <b>162</b>
-                                    <v>4000</v>
+                                    <v>4001</v>
                                 </b>
                                 <b>
                                     <a>162</a>
@@ -14335,7 +14382,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>38248</v>
+                                    <v>38250</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14366,12 +14413,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>62401</v>
+                                    <v>62404</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>16003</v>
+                                    <v>16004</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -14381,7 +14428,7 @@
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>8129</v>
+                                    <v>8130</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -14407,7 +14454,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>84398</v>
+                                    <v>84403</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -14500,11 +14547,11 @@
         </relation>
         <relation>
             <name>orphaned_variables</name>
-            <cardinality>44036</cardinality>
+            <cardinality>44035</cardinality>
             <columnsizes>
                 <e>
                     <k>var</k>
-                    <v>44036</v>
+                    <v>44035</v>
                 </e>
                 <e>
                     <k>function</k>
@@ -14522,7 +14569,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>44036</v>
+                                    <v>44035</v>
                                 </b>
                             </bs>
                         </hist>
@@ -14538,7 +14585,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>39940</v>
+                                    <v>39939</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -16147,15 +16194,15 @@
         </relation>
         <relation>
             <name>derivedtypes</name>
-            <cardinality>3023723</cardinality>
+            <cardinality>3023724</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3023723</v>
+                    <v>3023724</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>1457166</v>
+                    <v>1457167</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -16163,7 +16210,7 @@
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>1942142</v>
+                    <v>1942143</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -16177,7 +16224,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3023723</v>
+                                    <v>3023724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16193,7 +16240,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3023723</v>
+                                    <v>3023724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16209,7 +16256,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3023723</v>
+                                    <v>3023724</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16251,7 +16298,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1457166</v>
+                                    <v>1457167</v>
                                 </b>
                             </bs>
                         </hist>
@@ -16447,7 +16494,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1315917</v>
+                                    <v>1315918</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -17068,15 +17115,15 @@
         </relation>
         <relation>
             <name>typedefbase</name>
-            <cardinality>1755835</cardinality>
+            <cardinality>1755826</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1755835</v>
+                    <v>1755826</v>
                 </e>
                 <e>
                     <k>type_id</k>
-                    <v>834260</v>
+                    <v>834256</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -17090,7 +17137,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1755835</v>
+                                    <v>1755826</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17106,12 +17153,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>659366</v>
+                                    <v>659363</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>80761</v>
+                                    <v>80760</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -17895,15 +17942,15 @@
         </relation>
         <relation>
             <name>usertypes</name>
-            <cardinality>4137720</cardinality>
+            <cardinality>4137700</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4137720</v>
+                    <v>4137700</v>
                 </e>
                 <e>
                     <k>name</k>
-                    <v>915379</v>
+                    <v>915395</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -17921,7 +17968,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4137720</v>
+                                    <v>4137700</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17937,7 +17984,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4137720</v>
+                                    <v>4137700</v>
                                 </b>
                             </bs>
                         </hist>
@@ -17953,17 +18000,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>652086</v>
+                                    <v>652104</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>158093</v>
+                                    <v>158113</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>8</b>
-                                    <v>70346</v>
+                                    <v>70325</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -17984,12 +18031,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>863841</v>
+                                    <v>863858</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>10</b>
-                                    <v>51537</v>
+                                    <v>51536</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18124,8 +18171,8 @@
                                     <v>10</v>
                                 </b>
                                 <b>
-                                    <a>12187</a>
-                                    <b>12188</b>
+                                    <a>12189</a>
+                                    <b>12190</b>
                                     <v>10</v>
                                 </b>
                                 <b>
@@ -18141,11 +18188,11 @@
         </relation>
         <relation>
             <name>usertypesize</name>
-            <cardinality>1359666</cardinality>
+            <cardinality>1359659</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1359666</v>
+                    <v>1359659</v>
                 </e>
                 <e>
                     <k>size</k>
@@ -18167,7 +18214,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359666</v>
+                                    <v>1359659</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18183,7 +18230,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1359666</v>
+                                    <v>1359659</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18441,11 +18488,11 @@
         </relation>
         <relation>
             <name>usertype_alias_kind</name>
-            <cardinality>1755835</cardinality>
+            <cardinality>1755826</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1755835</v>
+                    <v>1755826</v>
                 </e>
                 <e>
                     <k>alias_kind</k>
@@ -18463,7 +18510,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1755835</v>
+                                    <v>1755826</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18494,11 +18541,11 @@
         </relation>
         <relation>
             <name>nontype_template_parameters</name>
-            <cardinality>761306</cardinality>
+            <cardinality>761296</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>761306</v>
+                    <v>761296</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -18578,15 +18625,15 @@
         </relation>
         <relation>
             <name>mangled_name</name>
-            <cardinality>7910441</cardinality>
+            <cardinality>7910443</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>7910441</v>
+                    <v>7910443</v>
                 </e>
                 <e>
                     <k>mangled_name</k>
-                    <v>6349608</v>
+                    <v>6349610</v>
                 </e>
                 <e>
                     <k>is_complete</k>
@@ -18604,7 +18651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7910441</v>
+                                    <v>7910443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18620,7 +18667,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7910441</v>
+                                    <v>7910443</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18636,7 +18683,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6016211</v>
+                                    <v>6016213</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -18657,7 +18704,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6349608</v>
+                                    <v>6349610</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18709,55 +18756,55 @@
         </relation>
         <relation>
             <name>is_pod_class</name>
-            <cardinality>590984</cardinality>
+            <cardinality>590976</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>590984</v>
+                    <v>590976</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_standard_layout_class</name>
-            <cardinality>1120590</cardinality>
+            <cardinality>1120585</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1120590</v>
+                    <v>1120585</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_complete</name>
-            <cardinality>1341571</cardinality>
+            <cardinality>1341565</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1341571</v>
+                    <v>1341565</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>is_class_template</name>
-            <cardinality>231195</cardinality>
+            <cardinality>231194</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>231195</v>
+                    <v>231194</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>class_instantiation</name>
-            <cardinality>1122200</cardinality>
+            <cardinality>1122247</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>1119212</v>
+                    <v>1119207</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -18775,12 +18822,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1117129</v>
+                                    <v>1117071</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>8</b>
-                                    <v>2082</v>
+                                    <v>2135</v>
                                 </b>
                             </bs>
                         </hist>
@@ -18816,12 +18863,12 @@
                                 <b>
                                     <a>5</a>
                                     <b>7</b>
-                                    <v>6059</v>
+                                    <v>6048</v>
                                 </b>
                                 <b>
                                     <a>7</a>
                                     <b>10</b>
-                                    <v>5680</v>
+                                    <v>5691</v>
                                 </b>
                                 <b>
                                     <a>10</a>
@@ -18846,11 +18893,11 @@
         </relation>
         <relation>
             <name>class_template_argument</name>
-            <cardinality>2887503</cardinality>
+            <cardinality>2887489</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>1362264</v>
+                    <v>1362258</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -18858,7 +18905,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>818795</v>
+                    <v>818791</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -18872,17 +18919,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>577753</v>
+                                    <v>577750</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408656</v>
+                                    <v>408654</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>249952</v>
+                                    <v>249951</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -18908,17 +18955,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>606188</v>
+                                    <v>606185</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>422595</v>
+                                    <v>422593</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>250784</v>
+                                    <v>250782</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -19031,12 +19078,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>511582</v>
+                                    <v>511580</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>166898</v>
+                                    <v>166897</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -19046,7 +19093,7 @@
                                 <b>
                                     <a>5</a>
                                     <b>46</b>
-                                    <v>61415</v>
+                                    <v>61414</v>
                                 </b>
                                 <b>
                                     <a>46</a>
@@ -19067,7 +19114,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>720908</v>
+                                    <v>720904</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19087,11 +19134,11 @@
         </relation>
         <relation>
             <name>class_template_argument_value</name>
-            <cardinality>506804</cardinality>
+            <cardinality>506797</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>204508</v>
+                    <v>204506</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19099,7 +19146,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>506668</v>
+                    <v>506662</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19113,12 +19160,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>154820</v>
+                                    <v>154818</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>43088</v>
+                                    <v>43087</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -19139,12 +19186,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>147001</v>
+                                    <v>146999</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>40211</v>
+                                    <v>40210</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -19282,7 +19329,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506533</v>
+                                    <v>506526</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19303,7 +19350,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>506668</v>
+                                    <v>506662</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19366,11 +19413,11 @@
         </relation>
         <relation>
             <name>type_mentions</name>
-            <cardinality>5911108</cardinality>
+            <cardinality>5911109</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5911108</v>
+                    <v>5911109</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -19378,7 +19425,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5854794</v>
+                    <v>5854796</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -19396,7 +19443,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5911108</v>
+                                    <v>5911109</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19412,7 +19459,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5911108</v>
+                                    <v>5911109</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19428,7 +19475,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5911108</v>
+                                    <v>5911109</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19562,7 +19609,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5809101</v>
+                                    <v>5809103</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19583,7 +19630,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5809101</v>
+                                    <v>5809103</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19604,7 +19651,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5854794</v>
+                                    <v>5854796</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19662,26 +19709,26 @@
         </relation>
         <relation>
             <name>is_function_template</name>
-            <cardinality>1328113</cardinality>
+            <cardinality>1328114</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>1328113</v>
+                    <v>1328114</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>function_instantiation</name>
-            <cardinality>967609</cardinality>
+            <cardinality>967596</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>967609</v>
+                    <v>967596</v>
                 </e>
                 <e>
                     <k>from</k>
-                    <v>181526</v>
+                    <v>181523</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19695,7 +19742,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>967609</v>
+                                    <v>967596</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19711,7 +19758,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>109836</v>
+                                    <v>109834</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19741,11 +19788,11 @@
         </relation>
         <relation>
             <name>function_template_argument</name>
-            <cardinality>2468763</cardinality>
+            <cardinality>2468730</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>1443916</v>
+                    <v>1443897</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -19753,7 +19800,7 @@
                 </e>
                 <e>
                     <k>arg_type</k>
-                    <v>296067</v>
+                    <v>296063</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -19767,22 +19814,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>777959</v>
+                                    <v>777949</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>410507</v>
+                                    <v>410501</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>170694</v>
+                                    <v>170692</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>15</b>
-                                    <v>84755</v>
+                                    <v>84753</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19798,22 +19845,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>796982</v>
+                                    <v>796971</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>408611</v>
+                                    <v>408606</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>168528</v>
+                                    <v>168526</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>9</b>
-                                    <v>69794</v>
+                                    <v>69793</v>
                                 </b>
                             </bs>
                         </hist>
@@ -19951,7 +19998,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>173639</v>
+                                    <v>173637</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -19971,7 +20018,7 @@
                                 <b>
                                     <a>6</a>
                                     <b>11</b>
-                                    <v>23084</v>
+                                    <v>23083</v>
                                 </b>
                                 <b>
                                     <a>11</a>
@@ -19997,7 +20044,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>255145</v>
+                                    <v>255142</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20017,11 +20064,11 @@
         </relation>
         <relation>
             <name>function_template_argument_value</name>
-            <cardinality>449838</cardinality>
+            <cardinality>449832</cardinality>
             <columnsizes>
                 <e>
                     <k>function_id</k>
-                    <v>195505</v>
+                    <v>195502</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -20029,7 +20076,7 @@
                 </e>
                 <e>
                     <k>arg_value</k>
-                    <v>447164</v>
+                    <v>447158</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -20043,12 +20090,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>150420</v>
+                                    <v>150418</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>42614</v>
+                                    <v>42613</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20069,12 +20116,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>143548</v>
+                                    <v>143546</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>36454</v>
+                                    <v>36453</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20222,7 +20269,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>444490</v>
+                                    <v>444484</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -20243,7 +20290,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>447164</v>
+                                    <v>447158</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20264,11 +20311,11 @@
         </relation>
         <relation>
             <name>variable_instantiation</name>
-            <cardinality>427355</cardinality>
+            <cardinality>427356</cardinality>
             <columnsizes>
                 <e>
                     <k>to</k>
-                    <v>427355</v>
+                    <v>427356</v>
                 </e>
                 <e>
                     <k>from</k>
@@ -20286,7 +20333,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>427355</v>
+                                    <v>427356</v>
                                 </b>
                             </bs>
                         </hist>
@@ -20383,7 +20430,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>189534</v>
+                                    <v>189535</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -20826,7 +20873,7 @@
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>6091</v>
+                    <v>6090</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -21791,15 +21838,15 @@
         </relation>
         <relation>
             <name>routinetypes</name>
-            <cardinality>600596</cardinality>
+            <cardinality>600588</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>600596</v>
+                    <v>600588</v>
                 </e>
                 <e>
                     <k>return_type</k>
-                    <v>282020</v>
+                    <v>282016</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -21813,7 +21860,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>600596</v>
+                                    <v>600588</v>
                                 </b>
                             </bs>
                         </hist>
@@ -21829,7 +21876,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>232568</v>
+                                    <v>232565</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -21839,7 +21886,7 @@
                                 <b>
                                     <a>3</a>
                                     <b>4677</b>
-                                    <v>14453</v>
+                                    <v>14452</v>
                                 </b>
                             </bs>
                         </hist>
@@ -22532,11 +22579,11 @@
         </relation>
         <relation>
             <name>funspecifiers</name>
-            <cardinality>9694783</cardinality>
+            <cardinality>9694661</cardinality>
             <columnsizes>
                 <e>
                     <k>func_id</k>
-                    <v>4002635</v>
+                    <v>4002014</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -22554,17 +22601,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1526111</v>
+                                    <v>1525489</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>506131</v>
+                                    <v>505634</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>1034042</v>
+                                    <v>1034540</v>
                                 </b>
                                 <b>
                                     <a>4</a>
@@ -22678,8 +22725,8 @@
                                     <v>124</v>
                                 </b>
                                 <b>
-                                    <a>22778</a>
-                                    <b>22779</b>
+                                    <a>22777</a>
+                                    <b>22778</b>
                                     <v>124</v>
                                 </b>
                             </bs>
@@ -22690,11 +22737,11 @@
         </relation>
         <relation>
             <name>varspecifiers</name>
-            <cardinality>3078854</cardinality>
+            <cardinality>3078855</cardinality>
             <columnsizes>
                 <e>
                     <k>var_id</k>
-                    <v>2314865</v>
+                    <v>2314866</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -23358,7 +23405,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>641033</v>
+                                    <v>641034</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24088,15 +24135,15 @@
         </relation>
         <relation>
             <name>attribute_arg_constant</name>
-            <cardinality>71524</cardinality>
+            <cardinality>71640</cardinality>
             <columnsizes>
                 <e>
                     <k>arg</k>
-                    <v>71524</v>
+                    <v>71640</v>
                 </e>
                 <e>
                     <k>constant</k>
-                    <v>71524</v>
+                    <v>71640</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24110,7 +24157,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71524</v>
+                                    <v>71640</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24126,7 +24173,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>71524</v>
+                                    <v>71640</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24547,15 +24594,15 @@
         </relation>
         <relation>
             <name>unspecifiedtype</name>
-            <cardinality>7228463</cardinality>
+            <cardinality>7228465</cardinality>
             <columnsizes>
                 <e>
                     <k>type_id</k>
-                    <v>7228463</v>
+                    <v>7228465</v>
                 </e>
                 <e>
                     <k>unspecified_type_id</k>
-                    <v>3955718</v>
+                    <v>3955719</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24569,7 +24616,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7228463</v>
+                                    <v>7228465</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24585,12 +24632,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2475279</v>
+                                    <v>2475280</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>1114435</v>
+                                    <v>1114436</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -24610,7 +24657,7 @@
         </relation>
         <relation>
             <name>member</name>
-            <cardinality>4182339</cardinality>
+            <cardinality>4182340</cardinality>
             <columnsizes>
                 <e>
                     <k>parent</k>
@@ -24622,7 +24669,7 @@
                 </e>
                 <e>
                     <k>child</k>
-                    <v>4177734</v>
+                    <v>4177735</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -24900,7 +24947,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4177734</v>
+                                    <v>4177735</v>
                                 </b>
                             </bs>
                         </hist>
@@ -24916,7 +24963,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4173129</v>
+                                    <v>4173131</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -24994,15 +25041,15 @@
         </relation>
         <relation>
             <name>derivations</name>
-            <cardinality>473802</cardinality>
+            <cardinality>473796</cardinality>
             <columnsizes>
                 <e>
                     <k>derivation</k>
-                    <v>473802</v>
+                    <v>473796</v>
                 </e>
                 <e>
                     <k>sub</k>
-                    <v>452207</v>
+                    <v>452201</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -25010,7 +25057,7 @@
                 </e>
                 <e>
                     <k>super</k>
-                    <v>234024</v>
+                    <v>234021</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -25028,7 +25075,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473802</v>
+                                    <v>473796</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25044,7 +25091,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473802</v>
+                                    <v>473796</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25060,7 +25107,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473802</v>
+                                    <v>473796</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25076,7 +25123,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>473802</v>
+                                    <v>473796</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25092,7 +25139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435791</v>
+                                    <v>435785</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25113,7 +25160,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435791</v>
+                                    <v>435785</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25134,7 +25181,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435791</v>
+                                    <v>435785</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25155,7 +25202,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>435791</v>
+                                    <v>435785</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25315,7 +25362,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>224276</v>
+                                    <v>224273</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25336,7 +25383,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>224276</v>
+                                    <v>224273</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25357,7 +25404,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>233584</v>
+                                    <v>233581</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25378,7 +25425,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>228710</v>
+                                    <v>228707</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25404,7 +25451,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3114</v>
+                                    <v>3113</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -25440,7 +25487,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>5</b>
-                                    <v>3114</v>
+                                    <v>3113</v>
                                 </b>
                                 <b>
                                     <a>5</a>
@@ -25512,11 +25559,11 @@
         </relation>
         <relation>
             <name>derspecifiers</name>
-            <cardinality>475562</cardinality>
+            <cardinality>475556</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>473362</v>
+                    <v>473356</v>
                 </e>
                 <e>
                     <k>spec_id</k>
@@ -25534,7 +25581,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>471162</v>
+                                    <v>471156</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -25580,11 +25627,11 @@
         </relation>
         <relation>
             <name>direct_base_offsets</name>
-            <cardinality>447062</cardinality>
+            <cardinality>447056</cardinality>
             <columnsizes>
                 <e>
                     <k>der_id</k>
-                    <v>447062</v>
+                    <v>447056</v>
                 </e>
                 <e>
                     <k>offset</k>
@@ -25602,7 +25649,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>447062</v>
+                                    <v>447056</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25799,11 +25846,11 @@
         </relation>
         <relation>
             <name>frienddecls</name>
-            <cardinality>695912</cardinality>
+            <cardinality>695869</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>695912</v>
+                    <v>695869</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -25811,7 +25858,7 @@
                 </e>
                 <e>
                     <k>decl_id</k>
-                    <v>77240</v>
+                    <v>77341</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -25829,7 +25876,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>695912</v>
+                                    <v>695869</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25845,7 +25892,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>695912</v>
+                                    <v>695869</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25861,7 +25908,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>695912</v>
+                                    <v>695869</v>
                                 </b>
                             </bs>
                         </hist>
@@ -25877,17 +25924,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6126</v>
+                                    <v>6160</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13877</v>
+                                    <v>13843</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>3554</v>
+                                    <v>3553</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -25933,17 +25980,17 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6126</v>
+                                    <v>6160</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>13877</v>
+                                    <v>13843</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>7</b>
-                                    <v>3554</v>
+                                    <v>3553</v>
                                 </b>
                                 <b>
                                     <a>7</a>
@@ -26010,12 +26057,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47556</v>
+                                    <v>47792</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6024</v>
+                                    <v>5889</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26051,12 +26098,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47556</v>
+                                    <v>47792</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>6024</v>
+                                    <v>5889</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -26092,7 +26139,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>76563</v>
+                                    <v>76664</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26117,7 +26164,7 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>20371</b>
+                                    <b>20370</b>
                                     <v>372</v>
                                 </b>
                             </bs>
@@ -26159,7 +26206,7 @@
                                 </b>
                                 <b>
                                     <a>2</a>
-                                    <b>2129</b>
+                                    <b>2132</b>
                                     <v>338</v>
                                 </b>
                             </bs>
@@ -26170,19 +26217,19 @@
         </relation>
         <relation>
             <name>comments</name>
-            <cardinality>11208574</cardinality>
+            <cardinality>11208577</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>11208574</v>
+                    <v>11208577</v>
                 </e>
                 <e>
                     <k>contents</k>
-                    <v>4294964</v>
+                    <v>4294966</v>
                 </e>
                 <e>
                     <k>location</k>
-                    <v>11208574</v>
+                    <v>11208577</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26196,7 +26243,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208574</v>
+                                    <v>11208577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26212,7 +26259,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208574</v>
+                                    <v>11208577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26228,7 +26275,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3920499</v>
+                                    <v>3920500</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26254,7 +26301,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3920499</v>
+                                    <v>3920500</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26280,7 +26327,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208574</v>
+                                    <v>11208577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26296,7 +26343,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>11208574</v>
+                                    <v>11208577</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26306,15 +26353,15 @@
         </relation>
         <relation>
             <name>commentbinding</name>
-            <cardinality>3905316</cardinality>
+            <cardinality>3905317</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>3342685</v>
+                    <v>3342686</v>
                 </e>
                 <e>
                     <k>element</k>
-                    <v>3740173</v>
+                    <v>3740174</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26328,7 +26375,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3281207</v>
+                                    <v>3281208</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26349,7 +26396,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>3575030</v>
+                                    <v>3575031</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26364,15 +26411,15 @@
         </relation>
         <relation>
             <name>exprconv</name>
-            <cardinality>9634072</cardinality>
+            <cardinality>9634075</cardinality>
             <columnsizes>
                 <e>
                     <k>converted</k>
-                    <v>9633966</v>
+                    <v>9633969</v>
                 </e>
                 <e>
                     <k>conversion</k>
-                    <v>9634072</v>
+                    <v>9634075</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26386,7 +26433,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9633861</v>
+                                    <v>9633864</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26407,7 +26454,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9634072</v>
+                                    <v>9634075</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26417,18 +26464,18 @@
         </relation>
         <relation>
             <name>compgenerated</name>
-            <cardinality>9923989</cardinality>
+            <cardinality>9923438</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>9923989</v>
+                    <v>9923438</v>
                 </e>
             </columnsizes>
             <dependencies/>
         </relation>
         <relation>
             <name>synthetic_destructor_call</name>
-            <cardinality>1666648</cardinality>
+            <cardinality>1666649</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
@@ -26440,7 +26487,7 @@
                 </e>
                 <e>
                     <k>destructor_call</k>
-                    <v>1666648</v>
+                    <v>1666649</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26454,7 +26501,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>826180</v>
+                                    <v>826181</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26480,7 +26527,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>826180</v>
+                                    <v>826181</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -26638,7 +26685,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1666648</v>
+                                    <v>1666649</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26654,7 +26701,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1666648</v>
+                                    <v>1666649</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26733,7 +26780,7 @@
         </relation>
         <relation>
             <name>namespacembrs</name>
-            <cardinality>2110396</cardinality>
+            <cardinality>2110397</cardinality>
             <columnsizes>
                 <e>
                     <k>parentid</k>
@@ -26741,7 +26788,7 @@
                 </e>
                 <e>
                     <k>memberid</k>
-                    <v>2110396</v>
+                    <v>2110397</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26831,7 +26878,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2110396</v>
+                                    <v>2110397</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26841,11 +26888,11 @@
         </relation>
         <relation>
             <name>exprparents</name>
-            <cardinality>19456291</cardinality>
+            <cardinality>19456297</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>19456291</v>
+                    <v>19456297</v>
                 </e>
                 <e>
                     <k>child_index</k>
@@ -26853,7 +26900,7 @@
                 </e>
                 <e>
                     <k>parent_id</k>
-                    <v>12941377</v>
+                    <v>12941381</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -26867,7 +26914,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19456291</v>
+                                    <v>19456297</v>
                                 </b>
                             </bs>
                         </hist>
@@ -26883,7 +26930,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>19456291</v>
+                                    <v>19456297</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27001,12 +27048,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7395563</v>
+                                    <v>7395565</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5083215</v>
+                                    <v>5083216</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27027,12 +27074,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>7395563</v>
+                                    <v>7395565</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>5083215</v>
+                                    <v>5083216</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -27047,11 +27094,11 @@
         </relation>
         <relation>
             <name>expr_isload</name>
-            <cardinality>6898014</cardinality>
+            <cardinality>6898016</cardinality>
             <columnsizes>
                 <e>
                     <k>expr_id</k>
-                    <v>6898014</v>
+                    <v>6898016</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -27136,11 +27183,11 @@
         </relation>
         <relation>
             <name>iscall</name>
-            <cardinality>5790817</cardinality>
+            <cardinality>5790819</cardinality>
             <columnsizes>
                 <e>
                     <k>caller</k>
-                    <v>5790817</v>
+                    <v>5790819</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -27158,7 +27205,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5790817</v>
+                                    <v>5790819</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27636,11 +27683,11 @@
         </relation>
         <relation>
             <name>varbind</name>
-            <cardinality>8255500</cardinality>
+            <cardinality>8255502</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>8255500</v>
+                    <v>8255502</v>
                 </e>
                 <e>
                     <k>var</k>
@@ -27658,7 +27705,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8255500</v>
+                                    <v>8255502</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27674,7 +27721,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>171553</v>
+                                    <v>171554</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -27704,7 +27751,7 @@
                                 <b>
                                     <a>7</a>
                                     <b>9</b>
-                                    <v>80823</v>
+                                    <v>80824</v>
                                 </b>
                                 <b>
                                     <a>9</a>
@@ -27729,15 +27776,15 @@
         </relation>
         <relation>
             <name>funbind</name>
-            <cardinality>5805683</cardinality>
+            <cardinality>5806092</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>5803624</v>
+                    <v>5803625</v>
                 </e>
                 <e>
                     <k>fun</k>
-                    <v>275028</v>
+                    <v>275286</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -27751,12 +27798,12 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5801564</v>
+                                    <v>5801158</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>2059</v>
+                                    <v>2466</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27772,22 +27819,22 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>180900</v>
+                                    <v>181071</v>
                                 </b>
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>38269</v>
+                                    <v>38312</v>
                                 </b>
                                 <b>
                                     <a>3</a>
                                     <b>4</b>
-                                    <v>16882</v>
+                                    <v>16903</v>
                                 </b>
                                 <b>
                                     <a>4</a>
                                     <b>8</b>
-                                    <v>22910</v>
+                                    <v>22931</v>
                                 </b>
                                 <b>
                                     <a>8</a>
@@ -27928,11 +27975,11 @@
         </relation>
         <relation>
             <name>expr_deallocator</name>
-            <cardinality>53479</cardinality>
+            <cardinality>53478</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>53479</v>
+                    <v>53478</v>
                 </e>
                 <e>
                     <k>func</k>
@@ -27954,7 +28001,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53479</v>
+                                    <v>53478</v>
                                 </b>
                             </bs>
                         </hist>
@@ -27970,7 +28017,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>53479</v>
+                                    <v>53478</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28075,15 +28122,15 @@
         </relation>
         <relation>
             <name>expr_cond_guard</name>
-            <cardinality>897971</cardinality>
+            <cardinality>897972</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>897971</v>
+                    <v>897972</v>
                 </e>
                 <e>
                     <k>guard</k>
-                    <v>897971</v>
+                    <v>897972</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28097,7 +28144,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897971</v>
+                                    <v>897972</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28113,7 +28160,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897971</v>
+                                    <v>897972</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28171,15 +28218,15 @@
         </relation>
         <relation>
             <name>expr_cond_false</name>
-            <cardinality>897971</cardinality>
+            <cardinality>897972</cardinality>
             <columnsizes>
                 <e>
                     <k>cond</k>
-                    <v>897971</v>
+                    <v>897972</v>
                 </e>
                 <e>
                     <k>false</k>
-                    <v>897971</v>
+                    <v>897972</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28193,7 +28240,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897971</v>
+                                    <v>897972</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28209,7 +28256,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>897971</v>
+                                    <v>897972</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28219,11 +28266,11 @@
         </relation>
         <relation>
             <name>values</name>
-            <cardinality>13541399</cardinality>
+            <cardinality>13541403</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>13541399</v>
+                    <v>13541403</v>
                 </e>
                 <e>
                     <k>str</k>
@@ -28241,7 +28288,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13541399</v>
+                                    <v>13541403</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28287,11 +28334,11 @@
         </relation>
         <relation>
             <name>valuetext</name>
-            <cardinality>6637514</cardinality>
+            <cardinality>6637663</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6637514</v>
+                    <v>6637663</v>
                 </e>
                 <e>
                     <k>text</k>
@@ -28309,7 +28356,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6637514</v>
+                                    <v>6637663</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28339,7 +28386,7 @@
                                 </b>
                                 <b>
                                     <a>7</a>
-                                    <b>593717</b>
+                                    <b>593719</b>
                                     <v>27872</v>
                                 </b>
                             </bs>
@@ -28350,15 +28397,15 @@
         </relation>
         <relation>
             <name>valuebind</name>
-            <cardinality>13649549</cardinality>
+            <cardinality>13649553</cardinality>
             <columnsizes>
                 <e>
                     <k>val</k>
-                    <v>13541399</v>
+                    <v>13541403</v>
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>13649549</v>
+                    <v>13649553</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -28372,7 +28419,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13451241</v>
+                                    <v>13451245</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -28393,7 +28440,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>13649549</v>
+                                    <v>13649553</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28795,11 +28842,11 @@
         </relation>
         <relation>
             <name>initialisers</name>
-            <cardinality>2244826</cardinality>
+            <cardinality>2244827</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>2244826</v>
+                    <v>2244827</v>
                 </e>
                 <e>
                     <k>var</k>
@@ -28807,7 +28854,7 @@
                 </e>
                 <e>
                     <k>expr</k>
-                    <v>2244826</v>
+                    <v>2244827</v>
                 </e>
                 <e>
                     <k>location</k>
@@ -28825,7 +28872,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244826</v>
+                                    <v>2244827</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28841,7 +28888,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244826</v>
+                                    <v>2244827</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28857,7 +28904,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244826</v>
+                                    <v>2244827</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28946,7 +28993,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244826</v>
+                                    <v>2244827</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28962,7 +29009,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244826</v>
+                                    <v>2244827</v>
                                 </b>
                             </bs>
                         </hist>
@@ -28978,7 +29025,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2244826</v>
+                                    <v>2244827</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29025,7 +29072,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>443422</v>
+                                    <v>443423</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29076,11 +29123,11 @@
         </relation>
         <relation>
             <name>braced_initialisers</name>
-            <cardinality>67626</cardinality>
+            <cardinality>67652</cardinality>
             <columnsizes>
                 <e>
                     <k>init</k>
-                    <v>67626</v>
+                    <v>67652</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -29145,11 +29192,11 @@
         </relation>
         <relation>
             <name>exprs</name>
-            <cardinality>25213256</cardinality>
+            <cardinality>25213263</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25213256</v>
+                    <v>25213263</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -29157,7 +29204,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>10586808</v>
+                    <v>10586811</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -29171,7 +29218,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213256</v>
+                                    <v>25213263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29187,7 +29234,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213256</v>
+                                    <v>25213263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29365,7 +29412,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>8904642</v>
+                                    <v>8904644</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29396,7 +29443,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>9044060</v>
+                                    <v>9044063</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -29542,11 +29589,11 @@
         </relation>
         <relation>
             <name>expr_types</name>
-            <cardinality>25213256</cardinality>
+            <cardinality>25213263</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>25213256</v>
+                    <v>25213263</v>
                 </e>
                 <e>
                     <k>typeid</k>
@@ -29568,7 +29615,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213256</v>
+                                    <v>25213263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29584,7 +29631,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>25213256</v>
+                                    <v>25213263</v>
                                 </b>
                             </bs>
                         </hist>
@@ -29848,6 +29895,17 @@
                 </dep>
             </dependencies>
         </relation>
+        <relation>
+            <name>param_ref_to_this</name>
+            <cardinality>24953</cardinality>
+            <columnsizes>
+                <e>
+                    <k>expr</k>
+                    <v>24953</v>
+                </e>
+            </columnsizes>
+            <dependencies/>
+        </relation>
         <relation>
             <name>aggregate_field_init</name>
             <cardinality>5717382</cardinality>
@@ -31234,11 +31292,11 @@
         </relation>
         <relation>
             <name>typeid_bind</name>
-            <cardinality>47590</cardinality>
+            <cardinality>47589</cardinality>
             <columnsizes>
                 <e>
                     <k>expr</k>
-                    <v>47590</v>
+                    <v>47589</v>
                 </e>
                 <e>
                     <k>type_id</k>
@@ -31256,7 +31314,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>47590</v>
+                                    <v>47589</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33066,11 +33124,11 @@
         </relation>
         <relation>
             <name>stmts</name>
-            <cardinality>6349655</cardinality>
+            <cardinality>6349657</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>6349655</v>
+                    <v>6349657</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -33078,7 +33136,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>2676167</v>
+                    <v>2676168</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33092,7 +33150,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6349655</v>
+                                    <v>6349657</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33108,7 +33166,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>6349655</v>
+                                    <v>6349657</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33346,7 +33404,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2218094</v>
+                                    <v>2218095</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33377,7 +33435,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2593460</v>
+                                    <v>2593461</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -33547,15 +33605,15 @@
         </relation>
         <relation>
             <name>if_then</name>
-            <cardinality>990318</cardinality>
+            <cardinality>990319</cardinality>
             <columnsizes>
                 <e>
                     <k>if_stmt</k>
-                    <v>990318</v>
+                    <v>990319</v>
                 </e>
                 <e>
                     <k>then_id</k>
-                    <v>990318</v>
+                    <v>990319</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -33569,7 +33627,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>990318</v>
+                                    <v>990319</v>
                                 </b>
                             </bs>
                         </hist>
@@ -33585,7 +33643,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>990318</v>
+                                    <v>990319</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34513,11 +34571,11 @@
         </relation>
         <relation>
             <name>stmtparents</name>
-            <cardinality>5611095</cardinality>
+            <cardinality>5611096</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5611095</v>
+                    <v>5611096</v>
                 </e>
                 <e>
                     <k>index</k>
@@ -34525,7 +34583,7 @@
                 </e>
                 <e>
                     <k>parent</k>
-                    <v>2374340</v>
+                    <v>2374341</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -34539,7 +34597,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5611095</v>
+                                    <v>5611096</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34555,7 +34613,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5611095</v>
+                                    <v>5611096</v>
                                 </b>
                             </bs>
                         </hist>
@@ -34698,7 +34756,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>515763</v>
+                                    <v>515764</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34739,7 +34797,7 @@
                                 <b>
                                     <a>2</a>
                                     <b>3</b>
-                                    <v>515763</v>
+                                    <v>515764</v>
                                 </b>
                                 <b>
                                     <a>3</a>
@@ -34769,11 +34827,11 @@
         </relation>
         <relation>
             <name>ishandler</name>
-            <cardinality>43261</cardinality>
+            <cardinality>43218</cardinality>
             <columnsizes>
                 <e>
                     <k>block</k>
-                    <v>43261</v>
+                    <v>43218</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -35431,11 +35489,11 @@
         </relation>
         <relation>
             <name>preprocdirects</name>
-            <cardinality>5395213</cardinality>
+            <cardinality>5395215</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>5395213</v>
+                    <v>5395215</v>
                 </e>
                 <e>
                     <k>kind</k>
@@ -35443,7 +35501,7 @@
                 </e>
                 <e>
                     <k>location</k>
-                    <v>5392102</v>
+                    <v>5392103</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35457,7 +35515,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5395213</v>
+                                    <v>5395215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35473,7 +35531,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5395213</v>
+                                    <v>5395215</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35621,7 +35679,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5391977</v>
+                                    <v>5391979</v>
                                 </b>
                                 <b>
                                     <a>26</a>
@@ -35642,7 +35700,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>5392102</v>
+                                    <v>5392103</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35710,11 +35768,11 @@
         </relation>
         <relation>
             <name>preproctrue</name>
-            <cardinality>438182</cardinality>
+            <cardinality>438183</cardinality>
             <columnsizes>
                 <e>
                     <k>branch</k>
-                    <v>438182</v>
+                    <v>438183</v>
                 </e>
             </columnsizes>
             <dependencies/>
@@ -35732,15 +35790,15 @@
         </relation>
         <relation>
             <name>preproctext</name>
-            <cardinality>4341757</cardinality>
+            <cardinality>4341758</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>4341757</v>
+                    <v>4341758</v>
                 </e>
                 <e>
                     <k>head</k>
-                    <v>2947934</v>
+                    <v>2947935</v>
                 </e>
                 <e>
                     <k>body</k>
@@ -35758,7 +35816,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4341757</v>
+                                    <v>4341758</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35774,7 +35832,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>4341757</v>
+                                    <v>4341758</v>
                                 </b>
                             </bs>
                         </hist>
@@ -35790,7 +35848,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2749812</v>
+                                    <v>2749813</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35811,7 +35869,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>2866918</v>
+                                    <v>2866919</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35832,7 +35890,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1531462</v>
+                                    <v>1531463</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35858,7 +35916,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>1535693</v>
+                                    <v>1535694</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -35878,15 +35936,15 @@
         </relation>
         <relation>
             <name>includes</name>
-            <cardinality>317353</cardinality>
+            <cardinality>317352</cardinality>
             <columnsizes>
                 <e>
                     <k>id</k>
-                    <v>317353</v>
+                    <v>317352</v>
                 </e>
                 <e>
                     <k>included</k>
-                    <v>58459</v>
+                    <v>58458</v>
                 </e>
             </columnsizes>
             <dependencies>
@@ -35900,7 +35958,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>317353</v>
+                                    <v>317352</v>
                                 </b>
                             </bs>
                         </hist>
@@ -36004,11 +36062,11 @@
         </relation>
         <relation>
             <name>link_parent</name>
-            <cardinality>30225687</cardinality>
+            <cardinality>30225290</cardinality>
             <columnsizes>
                 <e>
                     <k>element</k>
-                    <v>3843833</v>
+                    <v>3843783</v>
                 </e>
                 <e>
                     <k>link_target</k>
@@ -36026,7 +36084,7 @@
                                 <b>
                                     <a>1</a>
                                     <b>2</b>
-                                    <v>527079</v>
+                                    <v>527072</v>
                                 </b>
                                 <b>
                                     <a>2</a>
@@ -36036,7 +36094,7 @@
                                 <b>
                                     <a>9</a>
                                     <b>10</b>
-                                    <v>3289980</v>
+                                    <v>3289937</v>
                                 </b>
                             </bs>
                         </hist>
diff --git a/cpp/ql/lib/upgrades/d2d611b3fdcc7c4fe370f0d115200a3aa6ad5837/old.dbscheme b/cpp/ql/lib/upgrades/d2d611b3fdcc7c4fe370f0d115200a3aa6ad5837/old.dbscheme
new file mode 100644
index 000000000000..d2d611b3fdcc
--- /dev/null
+++ b/cpp/ql/lib/upgrades/d2d611b3fdcc7c4fe370f0d115200a3aa6ad5837/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
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+;
+
+@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/d2d611b3fdcc7c4fe370f0d115200a3aa6ad5837/semmlecode.cpp.dbscheme b/cpp/ql/lib/upgrades/d2d611b3fdcc7c4fe370f0d115200a3aa6ad5837/semmlecode.cpp.dbscheme
new file mode 100644
index 000000000000..1402ab319d20
--- /dev/null
+++ b/cpp/ql/lib/upgrades/d2d611b3fdcc7c4fe370f0d115200a3aa6ad5837/semmlecode.cpp.dbscheme
@@ -0,0 +1,2479 @@
+
+/*- Compilations -*/
+
+/**
+ * An invocation of the compiler. Note that more than one file may be
+ * compiled per invocation. For example, this command compiles three
+ * source files:
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * The `id` simply identifies the invocation, while `cwd` is the working
+ * directory from which the compiler was invoked.
+ */
+compilations(
+    /**
+     * An invocation of the compiler. Note that more than one file may
+     * be compiled per invocation. For example, this command compiles
+     * three source files:
+     *
+     *   gcc -c f1.c f2.c f3.c
+     */
+    unique int id : @compilation,
+    string cwd : string ref
+);
+
+/**
+ * The arguments that were passed to the extractor for a compiler
+ * invocation. If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then typically there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | *path to extractor*
+ * 1   | `--mimic`
+ * 2   | `/usr/bin/gcc`
+ * 3   | `-c`
+ * 4   | f1.c
+ * 5   | f2.c
+ * 6   | f3.c
+ */
+#keyset[id, num]
+compilation_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * The expanded arguments that were passed to the extractor for a
+ * compiler invocation. This is similar to `compilation_args`, but
+ * for a `@someFile` argument, it includes the arguments from that
+ * file, rather than just taking the argument literally.
+ */
+#keyset[id, num]
+compilation_expanded_args(
+    int id : @compilation ref,
+    int num : int ref,
+    string arg : string ref
+);
+
+/**
+ * Optionally, record the build mode for each compilation.
+ */
+compilation_build_mode(
+    unique int id : @compilation ref,
+    int mode : int ref
+);
+
+/*
+case @compilation_build_mode.mode of
+  0 = @build_mode_none
+| 1 = @build_mode_manual
+| 2 = @build_mode_auto
+;
+*/
+
+/**
+ * The source files that are compiled by a compiler invocation.
+ * If `id` is for the compiler invocation
+ *
+ *   gcc -c f1.c f2.c f3.c
+ *
+ * then there will be rows for
+ *
+ * num | arg
+ * --- | ---
+ * 0   | f1.c
+ * 1   | f2.c
+ * 2   | f3.c
+ *
+ * Note that even if those files `#include` headers, those headers
+ * do not appear as rows.
+ */
+#keyset[id, num]
+compilation_compiling_files(
+    int id : @compilation ref,
+    int num : int ref,
+    int file : @file ref
+);
+
+/**
+ * The time taken by the extractor for a compiler invocation.
+ *
+ * For each file `num`, there will be rows for
+ *
+ * kind | seconds
+ * ---- | ---
+ * 1    | CPU seconds used by the extractor frontend
+ * 2    | Elapsed seconds during the extractor frontend
+ * 3    | CPU seconds used by the extractor backend
+ * 4    | Elapsed seconds during the extractor backend
+ */
+#keyset[id, num, kind]
+compilation_time(
+    int id : @compilation ref,
+    int num : int ref,
+    /* kind:
+       1 = frontend_cpu_seconds
+       2 = frontend_elapsed_seconds
+       3 = extractor_cpu_seconds
+       4 = extractor_elapsed_seconds
+    */
+    int kind : int ref,
+    float seconds : float ref
+);
+
+/**
+ * An error or warning generated by the extractor.
+ * The diagnostic message `diagnostic` was generated during compiler
+ * invocation `compilation`, and is the `file_number_diagnostic_number`th
+ * message generated while extracting the `file_number`th file of that
+ * invocation.
+ */
+#keyset[compilation, file_number, file_number_diagnostic_number]
+diagnostic_for(
+    int diagnostic : @diagnostic ref,
+    int compilation : @compilation ref,
+    int file_number : int ref,
+    int file_number_diagnostic_number : int ref
+);
+
+/**
+ * If extraction was successful, then `cpu_seconds` and
+ * `elapsed_seconds` are the CPU time and elapsed time (respectively)
+ * that extraction took for compiler invocation `id`.
+ */
+compilation_finished(
+    unique int id : @compilation ref,
+    float cpu_seconds : float ref,
+    float elapsed_seconds : float ref
+);
+
+/*- External data -*/
+
+/**
+ * External data, loaded from CSV files during snapshot creation. See
+ * [Tutorial: Incorporating external data](https://help.semmle.com/wiki/display/SD/Tutorial%3A+Incorporating+external+data)
+ * for more information.
+ */
+externalData(
+  int id : @externalDataElement,
+  string path : string ref,
+  int column: int ref,
+  string value : string ref
+);
+
+/*- Source location prefix -*/
+
+/**
+ * The source location of the snapshot.
+ */
+sourceLocationPrefix(string prefix : string ref);
+
+/*- Files and folders -*/
+
+/**
+ * The location of an element.
+ * The location spans column `startcolumn` of line `startline` to
+ * column `endcolumn` of line `endline` in file `file`.
+ * For more information, see
+ * [Locations](https://codeql.github.com/docs/writing-codeql-queries/providing-locations-in-codeql-queries/).
+ */
+locations_default(
+  unique int id: @location_default,
+  int file: @file ref,
+  int beginLine: int ref,
+  int beginColumn: int ref,
+  int endLine: int ref,
+  int endColumn: int ref
+);
+
+files(
+  unique int id: @file,
+  string name: string ref
+);
+
+folders(
+  unique int id: @folder,
+  string name: string ref
+);
+
+@container = @file | @folder
+
+containerparent(
+  int parent: @container ref,
+  unique int child: @container ref
+);
+
+/*- Lines of code -*/
+
+numlines(
+  int element_id: @sourceline ref,
+  int num_lines: int ref,
+  int num_code: int ref,
+  int num_comment: int ref
+);
+
+/*- Diagnostic messages -*/
+
+diagnostics(
+  unique int id: @diagnostic,
+  int severity: int ref,
+  string error_tag: string ref,
+  string error_message: string ref,
+  string full_error_message: string ref,
+  int location: @location_default ref
+);
+
+/*- C++ dbscheme -*/
+
+extractor_version(
+    string codeql_version: string ref,
+    string frontend_version: string ref
+)
+
+pch_uses(
+    int pch: @pch ref,
+    int compilation: @compilation ref,
+    int id: @file ref
+)
+
+#keyset[pch, compilation]
+pch_creations(
+    int pch: @pch,
+    int compilation: @compilation ref,
+    int from: @file ref
+)
+
+/** An element for which line-count information is available. */
+@sourceline = @file | @function | @variable | @enumconstant | @xmllocatable;
+
+fileannotations(
+    int id: @file ref,
+    int kind: int ref,
+    string name: string ref,
+    string value: string ref
+);
+
+inmacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+affectedbymacroexpansion(
+    int id: @element ref,
+    int inv: @macroinvocation ref
+);
+
+case @macroinvocation.kind of
+  1 = @macro_expansion
+| 2 = @other_macro_reference
+;
+
+macroinvocations(
+    unique int id: @macroinvocation,
+    int macro_id: @ppd_define ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+macroparent(
+    unique int id: @macroinvocation ref,
+    int parent_id: @macroinvocation ref
+);
+
+// a macroinvocation may be part of another location
+// the way to find a constant expression that uses a macro
+// is thus to find a constant expression that has a location
+// to which a macro invocation is bound
+macrolocationbind(
+    int id: @macroinvocation ref,
+    int location: @location_default ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_unexpanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+#keyset[invocation, argument_index]
+macro_argument_expanded(
+    int invocation: @macroinvocation ref,
+    int argument_index: int ref,
+    string text: string ref
+);
+
+case @function.kind of
+  0 = @unknown_function
+| 1 = @normal_function
+| 2 = @constructor
+| 3 = @destructor
+| 4 = @conversion_function
+| 5 = @operator
+// ... 6 = @builtin_function deprecated    // GCC built-in functions, e.g. __builtin___memcpy_chk
+| 7 = @user_defined_literal
+| 8 = @deduction_guide
+;
+
+functions(
+    unique int id: @function,
+    string name: string ref,
+    int kind: int ref
+);
+
+builtin_functions(
+    int id: @function ref
+)
+
+function_entry_point(
+    int id: @function ref,
+    unique int entry_point: @stmt ref
+);
+
+function_return_type(
+    int id: @function ref,
+    int return_type: @type ref
+);
+
+/**
+ * If `function` is a coroutine, then this gives the `std::experimental::resumable_traits`
+ * instance associated with it, and the variables representing the `handle` and `promise`
+ * for it.
+ */
+coroutine(
+  unique int function: @function ref,
+  int traits: @type ref
+);
+
+/*
+case @coroutine_placeholder_variable.kind of
+  1 = @handle
+| 2 = @promise
+| 3 = @init_await_resume
+;
+*/
+
+coroutine_placeholder_variable(
+  unique int placeholder_variable: @variable ref,
+  int kind: int ref,
+  int function: @function ref
+)
+
+/** The `new` function used for allocating the coroutine state, if any. */
+coroutine_new(
+  unique int function: @function ref,
+  int new: @function ref
+);
+
+/** The `delete` function used for deallocating the coroutine state, if any. */
+coroutine_delete(
+  unique int function: @function ref,
+  int delete: @function ref
+);
+
+purefunctions(unique int id: @function ref);
+
+function_deleted(unique int id: @function ref);
+
+function_defaulted(unique int id: @function ref);
+
+function_prototyped(unique int id: @function ref)
+
+deduction_guide_for_class(
+    int id: @function ref,
+    int class_template: @usertype ref
+)
+
+member_function_this_type(
+    unique int id: @function ref,
+    int this_type: @type ref
+);
+
+#keyset[id, type_id]
+fun_decls(
+    int id: @fun_decl,
+    int function: @function ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+fun_def(unique int id: @fun_decl ref);
+fun_specialized(unique int id: @fun_decl ref);
+fun_implicit(unique int id: @fun_decl ref);
+fun_decl_specifiers(
+    int id: @fun_decl ref,
+    string name: string ref
+)
+#keyset[fun_decl, index]
+fun_decl_throws(
+    int fun_decl: @fun_decl ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+/* an empty throw specification is different from none */
+fun_decl_empty_throws(unique int fun_decl: @fun_decl ref);
+fun_decl_noexcept(
+    int fun_decl: @fun_decl ref,
+    int constant: @expr ref
+);
+fun_decl_empty_noexcept(int fun_decl: @fun_decl ref);
+fun_decl_typedef_type(
+    unique int fun_decl: @fun_decl ref,
+    int typedeftype_id: @usertype ref
+);
+
+/*
+case @fun_requires.kind of
+  1 = @template_attached
+| 2 = @function_attached
+;
+*/
+
+fun_requires(
+    int id: @fun_decl ref,
+    int kind: int ref,
+    int constraint: @expr ref
+);
+
+param_decl_bind(
+    unique int id: @var_decl ref,
+    int index: int ref,
+    int fun_decl: @fun_decl ref
+);
+
+#keyset[id, type_id]
+var_decls(
+    int id: @var_decl,
+    int variable: @variable ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+var_def(unique int id: @var_decl ref);
+var_specialized(int id: @var_decl ref);
+var_decl_specifiers(
+    int id: @var_decl ref,
+    string name: string ref
+)
+is_structured_binding(unique int id: @variable ref);
+var_requires(
+    int id: @var_decl ref,
+    int constraint: @expr ref
+);
+
+type_decls(
+    unique int id: @type_decl,
+    int type_id: @type ref,
+    int location: @location_default ref
+);
+type_def(unique int id: @type_decl ref);
+type_decl_top(
+    unique int type_decl: @type_decl ref
+);
+type_requires(
+    int id: @type_decl ref,
+    int constraint: @expr ref
+);
+
+namespace_decls(
+    unique int id: @namespace_decl,
+    int namespace_id: @namespace ref,
+    int location: @location_default ref,
+    int bodylocation: @location_default ref
+);
+
+case @using.kind of
+  1 = @using_declaration
+| 2 = @using_directive
+| 3 = @using_enum_declaration
+;
+
+usings(
+    unique int id: @using,
+    int element_id: @element ref,
+    int location: @location_default ref,
+    int kind: int ref
+);
+
+/** The element which contains the `using` declaration. */
+using_container(
+    int parent: @element ref,
+    int child: @using ref
+);
+
+static_asserts(
+    unique int id: @static_assert,
+    int condition : @expr ref,
+    string message : string ref,
+    int location: @location_default ref,
+    int enclosing : @element ref
+);
+
+// each function has an ordered list of parameters
+#keyset[id, type_id]
+#keyset[function, index, type_id]
+params(
+    int id: @parameter,
+    int function: @parameterized_element ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+overrides(
+    int new: @function ref,
+    int old: @function ref
+);
+
+#keyset[id, type_id]
+membervariables(
+    int id: @membervariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+globalvariables(
+    int id: @globalvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+#keyset[id, type_id]
+localvariables(
+    int id: @localvariable,
+    int type_id: @type ref,
+    string name: string ref
+);
+
+autoderivation(
+    unique int var: @variable ref,
+    int derivation_type: @type ref
+);
+
+orphaned_variables(
+    int var: @localvariable ref,
+    int function: @function ref
+)
+
+enumconstants(
+    unique int id: @enumconstant,
+    int parent: @usertype ref,
+    int index: int ref,
+    int type_id: @type ref,
+    string name: string ref,
+    int location: @location_default ref
+);
+
+@variable = @localscopevariable | @globalvariable | @membervariable;
+
+@localscopevariable = @localvariable | @parameter;
+
+/**
+ * Built-in types are the fundamental types, e.g., integral, floating, and void.
+ */
+case @builtintype.kind of
+   1 = @errortype
+|  2 = @unknowntype
+|  3 = @void
+|  4 = @boolean
+|  5 = @char
+|  6 = @unsigned_char
+|  7 = @signed_char
+|  8 = @short
+|  9 = @unsigned_short
+| 10 = @signed_short
+| 11 = @int
+| 12 = @unsigned_int
+| 13 = @signed_int
+| 14 = @long
+| 15 = @unsigned_long
+| 16 = @signed_long
+| 17 = @long_long
+| 18 = @unsigned_long_long
+| 19 = @signed_long_long
+// ... 20 Microsoft-specific __int8
+// ... 21 Microsoft-specific __int16
+// ... 22 Microsoft-specific __int32
+// ... 23 Microsoft-specific __int64
+| 24 = @float
+| 25 = @double
+| 26 = @long_double
+| 27 = @complex_float         // C99-specific _Complex float
+| 28 = @complex_double        // C99-specific _Complex double
+| 29 = @complex_long_double   // C99-specific _Complex long double
+| 30 = @imaginary_float       // C99-specific _Imaginary float
+| 31 = @imaginary_double      // C99-specific _Imaginary double
+| 32 = @imaginary_long_double // C99-specific _Imaginary long double
+| 33 = @wchar_t               // Microsoft-specific
+| 34 = @decltype_nullptr      // C++11
+| 35 = @int128                // __int128
+| 36 = @unsigned_int128       // unsigned __int128
+| 37 = @signed_int128         // signed __int128
+| 38 = @float128              // __float128
+| 39 = @complex_float128      // _Complex __float128
+// ... 40 _Decimal32
+// ... 41 _Decimal64
+// ... 42 _Decimal128
+| 43 = @char16_t
+| 44 = @char32_t
+| 45 = @std_float32           // _Float32
+| 46 = @float32x              // _Float32x
+| 47 = @std_float64           // _Float64
+| 48 = @float64x              // _Float64x
+| 49 = @std_float128          // _Float128
+// ... 50 _Float128x
+| 51 = @char8_t
+| 52 = @float16               // _Float16
+| 53 = @complex_float16       // _Complex _Float16
+| 54 = @fp16                  // __fp16
+| 55 = @std_bfloat16          // __bf16
+| 56 = @std_float16           // std::float16_t
+| 57 = @complex_std_float32   // _Complex _Float32
+| 58 = @complex_float32x      // _Complex _Float32x
+| 59 = @complex_std_float64   // _Complex _Float64
+| 60 = @complex_float64x      // _Complex _Float64x
+| 61 = @complex_std_float128  // _Complex _Float128
+| 62 = @mfp8                  // __mfp8
+| 63 = @scalable_vector_count // __SVCount_t
+| 64 = @complex_fp16          // _Complex __fp16
+| 65 = @complex_std_bfloat16  // _Complex __bf16
+| 66 = @complex_std_float16   // _Complex std::float16_t
+;
+
+builtintypes(
+    unique int id: @builtintype,
+    string name: string ref,
+    int kind: int ref,
+    int size: int ref,
+    int sign: int ref,
+    int alignment: int ref
+);
+
+/**
+ * Derived types are types that are directly derived from existing types and
+ * point to, refer to, transform type data to return a new type.
+ */
+case @derivedtype.kind of
+   1 = @pointer
+|  2 = @reference
+|  3 = @type_with_specifiers
+|  4 = @array
+|  5 = @gnu_vector
+|  6 = @routineptr
+|  7 = @routinereference
+|  8 = @rvalue_reference // C++11
+// ... 9 type_conforming_to_protocols deprecated
+| 10 = @block
+| 11 = @scalable_vector // Arm SVE
+;
+
+derivedtypes(
+    unique int id: @derivedtype,
+    string name: string ref,
+    int kind: int ref,
+    int type_id: @type ref
+);
+
+pointerishsize(unique int id: @derivedtype ref,
+    int size: int ref,
+    int alignment: int ref);
+
+arraysizes(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref,
+    int bytesize: int ref,
+    int alignment: int ref
+);
+
+tupleelements(
+    unique int id: @derivedtype ref,
+    int num_elements: int ref
+);
+
+typedefbase(
+    unique int id: @usertype ref,
+    int type_id: @type ref
+);
+
+/**
+ * An instance of the C++11 `decltype` operator or C23 `typeof`/`typeof_unqual`
+ * operator taking an expression as its argument.  For example:
+ * ```
+ * int a;
+ * decltype(1+a) b;
+ * typeof(1+a) c;
+ * ```
+ * Here `expr` is `1+a`.
+ *
+ * Sometimes an additional pair of parentheses around the expression
+ * changes the semantics of the decltype, e.g.
+ * ```
+ * struct A { double x; };
+ * const A* a = new A();
+ * decltype( a->x ); // type is double
+ * decltype((a->x)); // type is const double&
+ * ```
+ * (Please consult the C++11 standard for more details).
+ * `parentheses_would_change_meaning` is `true` iff that is the case.
+ */
+
+/*
+case @decltype.kind of
+|  0 = @decltype
+|  1 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+;
+*/
+
+#keyset[id, expr]
+decltypes(
+    int id: @decltype,
+    int expr: @expr ref,
+    int kind: int ref,
+    int base_type: @type ref,
+    boolean parentheses_would_change_meaning: boolean ref
+);
+
+case @type_operator.kind of
+   0 = @typeof // The frontend does not differentiate between typeof and typeof_unqual
+|  1 = @underlying_type
+|  2 = @bases
+|  3 = @direct_bases
+|  4 = @add_lvalue_reference
+|  5 = @add_pointer
+|  6 = @add_rvalue_reference
+|  7 = @decay
+|  8 = @make_signed
+|  9 = @make_unsigned
+| 10 = @remove_all_extents
+| 11 = @remove_const
+| 12 = @remove_cv
+| 13 = @remove_cvref
+| 14 = @remove_extent
+| 15 = @remove_pointer
+| 16 = @remove_reference_t
+| 17 = @remove_restrict
+| 18 = @remove_volatile
+| 19 = @remove_reference
+;
+
+type_operators(
+    unique int id: @type_operator,
+    int arg_type: @type ref,
+    int kind: int ref,
+    int base_type: @type ref
+)
+
+case @usertype.kind of
+   0 = @unknown_usertype
+|  1 = @struct
+|  2 = @class
+|  3 = @union
+|  4 = @enum
+// ... 5 = @typedef deprecated        // classic C: typedef typedef type name
+// ... 6 = @template deprecated
+|  7 = @template_parameter
+|  8 = @template_template_parameter
+|  9 = @proxy_class                   // a proxy class associated with a template parameter
+// ... 10 objc_class deprecated
+// ... 11 objc_protocol deprecated
+// ... 12 objc_category deprecated
+| 13 = @scoped_enum
+// ... 14 = @using_alias deprecated   // a using name = type style typedef
+| 15 = @template_struct
+| 16 = @template_class
+| 17 = @template_union
+| 18 = @alias
+;
+
+usertypes(
+    unique int id: @usertype,
+    string name: string ref,
+    int kind: int ref
+);
+
+usertypesize(
+    unique int id: @usertype ref,
+    int size: int ref,
+    int alignment: int ref
+);
+
+usertype_final(unique int id: @usertype ref);
+
+usertype_uuid(
+    unique int id: @usertype ref,
+    string uuid: string ref
+);
+
+/*
+case @usertype.alias_kind of
+| 0 = @typedef
+| 1 = @alias
+*/
+
+usertype_alias_kind(
+    int id: @usertype ref,
+    int alias_kind: int ref
+)
+
+nontype_template_parameters(
+    int id: @expr ref
+);
+
+type_template_type_constraint(
+    int id: @usertype ref,
+    int constraint: @expr ref
+);
+
+mangled_name(
+    unique int id: @declaration ref,
+    int mangled_name : @mangledname,
+    boolean is_complete: boolean ref
+);
+
+is_pod_class(unique int id: @usertype ref);
+is_standard_layout_class(unique int id: @usertype ref);
+
+is_complete(unique int id: @usertype ref);
+
+is_class_template(unique int id: @usertype ref);
+class_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+class_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+class_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@user_or_decltype = @usertype | @decltype;
+
+is_proxy_class_for(
+    unique int id: @usertype ref,
+    int templ_param_id: @user_or_decltype ref
+);
+
+type_mentions(
+    unique int id: @type_mention,
+    int type_id: @type ref,
+    int location: @location_default ref,
+    // a_symbol_reference_kind from the frontend.
+    int kind: int ref
+);
+
+is_function_template(unique int id: @function ref);
+function_instantiation(
+    unique int to: @function ref,
+    int from: @function ref
+);
+function_template_argument(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+function_template_argument_value(
+    int function_id: @function ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+is_variable_template(unique int id: @variable ref);
+variable_instantiation(
+    unique int to: @variable ref,
+    int from: @variable ref
+);
+variable_template_argument(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+variable_template_argument_value(
+    int variable_id: @variable ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+template_template_instantiation(
+    int to: @usertype ref,
+    int from: @usertype ref
+);
+template_template_argument(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+template_template_argument_value(
+    int type_id: @usertype ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+@concept = @concept_template | @concept_id;
+
+concept_templates(
+    unique int concept_id: @concept_template,
+    string name: string ref,
+    int location: @location_default ref
+);
+concept_instantiation(
+    unique int to: @concept_id ref,
+    int from: @concept_template ref
+);
+is_type_constraint(int concept_id: @concept_id ref);
+concept_template_argument(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_type: @type ref
+);
+concept_template_argument_value(
+    int concept_id: @concept ref,
+    int index: int ref,
+    int arg_value: @expr ref
+);
+
+routinetypes(
+    unique int id: @routinetype,
+    int return_type: @type ref
+);
+
+routinetypeargs(
+    int routine: @routinetype ref,
+    int index: int ref,
+    int type_id: @type ref
+);
+
+ptrtomembers(
+    unique int id: @ptrtomember,
+    int type_id: @type ref,
+    int class_id: @type ref
+);
+
+/*
+ specifiers for types, functions, and variables
+
+    "public",
+    "protected",
+    "private",
+
+    "const",
+    "volatile",
+    "static",
+
+    "pure",
+    "virtual",
+    "sealed", // Microsoft
+    "__interface", // Microsoft
+    "inline",
+    "explicit",
+
+    "near", // near far extension
+    "far", // near far extension
+    "__ptr32", // Microsoft
+    "__ptr64", // Microsoft
+    "__sptr", // Microsoft
+    "__uptr", // Microsoft
+    "dllimport", // Microsoft
+    "dllexport", // Microsoft
+    "thread", // Microsoft
+    "naked", // Microsoft
+    "microsoft_inline", // Microsoft
+    "forceinline", // Microsoft
+    "selectany", // Microsoft
+    "nothrow", // Microsoft
+    "novtable", // Microsoft
+    "noreturn", // Microsoft
+    "noinline", // Microsoft
+    "noalias", // Microsoft
+    "restrict", // Microsoft
+*/
+
+specifiers(
+    unique int id: @specifier,
+    unique string str: string ref
+);
+
+typespecifiers(
+    int type_id: @type ref,
+    int spec_id: @specifier ref
+);
+
+funspecifiers(
+    int func_id: @function ref,
+    int spec_id: @specifier ref
+);
+
+varspecifiers(
+    int var_id: @accessible ref,
+    int spec_id: @specifier ref
+);
+
+explicit_specifier_exprs(
+    unique int func_id: @function ref,
+    int constant: @expr ref
+)
+
+attributes(
+    unique int id: @attribute,
+    int kind: int ref,
+    string name: string ref,
+    string name_space: string ref,
+    int location: @location_default ref
+);
+
+case @attribute.kind of
+  0 = @gnuattribute
+| 1 = @stdattribute
+| 2 = @declspec
+| 3 = @msattribute
+| 4 = @alignas
+// ... 5 @objc_propertyattribute deprecated
+;
+
+attribute_args(
+    unique int id: @attribute_arg,
+    int kind: int ref,
+    int attribute: @attribute ref,
+    int index: int ref,
+    int location: @location_default ref
+);
+
+case @attribute_arg.kind of
+  0 = @attribute_arg_empty
+| 1 = @attribute_arg_token
+| 2 = @attribute_arg_constant
+| 3 = @attribute_arg_type
+| 4 = @attribute_arg_constant_expr
+| 5 = @attribute_arg_expr
+;
+
+attribute_arg_value(
+    unique int arg: @attribute_arg ref,
+    string value: string ref
+);
+attribute_arg_type(
+    unique int arg: @attribute_arg ref,
+    int type_id: @type ref
+);
+attribute_arg_constant(
+    unique int arg: @attribute_arg ref,
+    int constant: @expr ref
+)
+attribute_arg_expr(
+    unique int arg: @attribute_arg ref,
+    int expr: @expr ref
+)
+attribute_arg_name(
+    unique int arg: @attribute_arg ref,
+    string name: string ref
+);
+
+typeattributes(
+    int type_id: @type ref,
+    int spec_id: @attribute ref
+);
+
+funcattributes(
+    int func_id: @function ref,
+    int spec_id: @attribute ref
+);
+
+varattributes(
+    int var_id: @accessible ref,
+    int spec_id: @attribute ref
+);
+
+namespaceattributes(
+    int namespace_id: @namespace ref,
+    int spec_id: @attribute ref
+);
+
+stmtattributes(
+    int stmt_id: @stmt ref,
+    int spec_id: @attribute ref
+);
+
+@type = @builtintype
+      | @derivedtype
+      | @usertype
+      | @routinetype
+      | @ptrtomember
+      | @decltype
+      | @type_operator;
+
+unspecifiedtype(
+    unique int type_id: @type ref,
+    int unspecified_type_id: @type ref
+);
+
+member(
+    int parent: @type ref,
+    int index: int ref,
+    int child: @member ref
+);
+
+@enclosingfunction_child = @usertype | @variable | @namespace
+
+enclosingfunction(
+    unique int child: @enclosingfunction_child ref,
+    int parent: @function ref
+);
+
+derivations(
+    unique int derivation: @derivation,
+    int sub: @type ref,
+    int index: int ref,
+    int super: @type ref,
+    int location: @location_default ref
+);
+
+derspecifiers(
+    int der_id: @derivation ref,
+    int spec_id: @specifier ref
+);
+
+/**
+ * Contains the byte offset of the base class subobject within the derived
+ * class. Only holds for non-virtual base classes, but see table
+ * `virtual_base_offsets` for offsets of virtual base class subobjects.
+ */
+direct_base_offsets(
+    unique int der_id: @derivation ref,
+    int offset: int ref
+);
+
+/**
+ * Contains the byte offset of the virtual base class subobject for class
+ * `super` within a most-derived object of class `sub`. `super` can be either a
+ * direct or indirect base class.
+ */
+#keyset[sub, super]
+virtual_base_offsets(
+    int sub: @usertype ref,
+    int super: @usertype ref,
+    int offset: int ref
+);
+
+frienddecls(
+    unique int id: @frienddecl,
+    int type_id: @type ref,
+    int decl_id: @declaration ref,
+    int location: @location_default ref
+);
+
+@declaredtype = @usertype ;
+
+@declaration = @function
+             | @declaredtype
+             | @variable
+             | @enumconstant
+             | @frienddecl
+             | @concept_template;
+
+@member = @membervariable
+        | @function
+        | @declaredtype
+        | @enumconstant;
+
+@locatable = @diagnostic
+           | @declaration
+           | @ppd_include
+           | @ppd_define
+           | @macroinvocation
+           /*| @funcall*/
+           | @xmllocatable
+           | @attribute
+           | @attribute_arg;
+
+@namedscope = @namespace | @usertype;
+
+@element = @locatable
+         | @file
+         | @folder
+         | @specifier
+         | @type
+         | @expr
+         | @namespace
+         | @initialiser
+         | @stmt
+         | @derivation
+         | @comment
+         | @preprocdirect
+         | @fun_decl
+         | @var_decl
+         | @type_decl
+         | @namespace_decl
+         | @using
+         | @namequalifier
+         | @specialnamequalifyingelement
+         | @static_assert
+         | @type_mention
+         | @lambdacapture;
+
+@exprparent = @element;
+
+comments(
+    unique int id: @comment,
+    string contents: string ref,
+    int location: @location_default ref
+);
+
+commentbinding(
+    int id: @comment ref,
+    int element: @element ref
+);
+
+exprconv(
+    int converted: @expr ref,
+    unique int conversion: @expr ref
+);
+
+compgenerated(unique int id: @element ref);
+
+/**
+ * `destructor_call` destructs the `i`'th entity that should be
+ * destructed following `element`. Note that entities should be
+ * destructed in reverse construction order, so for a given `element`
+ * these should be called from highest to lowest `i`.
+ */
+#keyset[element, destructor_call]
+#keyset[element, i]
+synthetic_destructor_call(
+    int element: @element ref,
+    int i: int ref,
+    int destructor_call: @routineexpr ref
+);
+
+namespaces(
+    unique int id: @namespace,
+    string name: string ref
+);
+
+namespace_inline(
+    unique int id: @namespace ref
+);
+
+namespacembrs(
+    int parentid: @namespace ref,
+    unique int memberid: @namespacembr ref
+);
+
+@namespacembr = @declaration | @namespace;
+
+exprparents(
+    int expr_id: @expr ref,
+    int child_index: int ref,
+    int parent_id: @exprparent ref
+);
+
+expr_isload(unique int expr_id: @expr ref);
+
+@cast = @c_style_cast
+      | @const_cast
+      | @dynamic_cast
+      | @reinterpret_cast
+      | @static_cast
+      ;
+
+/*
+case @conversion.kind of
+  0 = @simple_conversion           // a numeric conversion, qualification conversion, or a reinterpret_cast
+| 1 = @bool_conversion             // conversion to 'bool'
+| 2 = @base_class_conversion       // a derived-to-base conversion
+| 3 = @derived_class_conversion    // a base-to-derived conversion
+| 4 = @pm_base_class_conversion    // a derived-to-base conversion of a pointer to member
+| 5 = @pm_derived_class_conversion // a base-to-derived conversion of a pointer to member
+| 6 = @glvalue_adjust              // an adjustment of the type of a glvalue
+| 7 = @prvalue_adjust              // an adjustment of the type of a prvalue
+;
+*/
+/**
+ * Describes the semantics represented by a cast expression. This is largely
+ * independent of the source syntax of the cast, so it is separate from the
+ * regular expression kind.
+ */
+conversionkinds(
+    unique int expr_id: @cast ref,
+    int kind: int ref
+);
+
+@conversion = @cast
+            | @array_to_pointer
+            | @parexpr
+            | @reference_to
+            | @ref_indirect
+            | @temp_init
+            | @c11_generic
+            ;
+
+/*
+case @funbindexpr.kind of
+  0 = @normal_call  // a normal call
+| 1 = @virtual_call // a virtual call
+| 2 = @adl_call     // a call whose target is only found by ADL
+;
+*/
+iscall(
+    unique int caller: @funbindexpr ref,
+    int kind: int ref
+);
+
+numtemplatearguments(
+    unique int expr_id: @expr ref,
+    int num: int ref
+);
+
+specialnamequalifyingelements(
+    unique int id: @specialnamequalifyingelement,
+    unique string name: string ref
+);
+
+@namequalifiableelement = @expr | @namequalifier;
+@namequalifyingelement = @namespace
+                       | @specialnamequalifyingelement
+                       | @usertype
+                       | @decltype;
+
+namequalifiers(
+    unique int id: @namequalifier,
+    unique int qualifiableelement: @namequalifiableelement ref,
+    int qualifyingelement: @namequalifyingelement ref,
+    int location: @location_default ref
+);
+
+varbind(
+    int expr: @varbindexpr ref,
+    int var: @accessible ref
+);
+
+funbind(
+    int expr: @funbindexpr ref,
+    int fun: @function ref
+);
+
+@any_new_expr = @new_expr
+              | @new_array_expr;
+
+@new_or_delete_expr = @any_new_expr
+                    | @delete_expr
+                    | @delete_array_expr;
+
+@prefix_crement_expr = @preincrexpr | @predecrexpr;
+
+@postfix_crement_expr = @postincrexpr | @postdecrexpr;
+
+@increment_expr = @preincrexpr | @postincrexpr;
+
+@decrement_expr = @predecrexpr | @postdecrexpr;
+
+@crement_expr = @increment_expr | @decrement_expr;
+
+@un_arith_op_expr = @arithnegexpr
+                  | @unaryplusexpr
+                  | @conjugation
+                  | @realpartexpr
+                  | @imagpartexpr
+                  | @crement_expr
+                  ;
+
+@un_bitwise_op_expr = @complementexpr;
+
+@un_log_op_expr = @notexpr;
+
+@un_op_expr = @address_of
+            | @indirect
+            | @un_arith_op_expr
+            | @un_bitwise_op_expr
+            | @builtinaddressof
+            | @vec_fill
+            | @un_log_op_expr
+            | @co_await
+            | @co_yield
+            ;
+
+@bin_log_op_expr = @andlogicalexpr | @orlogicalexpr;
+
+@cmp_op_expr = @eq_op_expr | @rel_op_expr;
+
+@eq_op_expr = @eqexpr | @neexpr;
+
+@rel_op_expr = @gtexpr
+             | @ltexpr
+             | @geexpr
+             | @leexpr
+             | @spaceshipexpr
+             ;
+
+@bin_bitwise_op_expr = @lshiftexpr
+                     | @rshiftexpr
+                     | @andexpr
+                     | @orexpr
+                     | @xorexpr
+                     ;
+
+@p_arith_op_expr = @paddexpr
+                 | @psubexpr
+                 | @pdiffexpr
+                 ;
+
+@bin_arith_op_expr = @addexpr
+                   | @subexpr
+                   | @mulexpr
+                   | @divexpr
+                   | @remexpr
+                   | @jmulexpr
+                   | @jdivexpr
+                   | @fjaddexpr
+                   | @jfaddexpr
+                   | @fjsubexpr
+                   | @jfsubexpr
+                   | @minexpr
+                   | @maxexpr
+                   | @p_arith_op_expr
+                   ;
+
+@bin_op_expr = @bin_arith_op_expr
+             | @bin_bitwise_op_expr
+             | @cmp_op_expr
+             | @bin_log_op_expr
+             ;
+
+@op_expr = @un_op_expr
+         | @bin_op_expr
+         | @assign_expr
+         | @conditionalexpr
+         ;
+
+@assign_arith_expr = @assignaddexpr
+                   | @assignsubexpr
+                   | @assignmulexpr
+                   | @assigndivexpr
+                   | @assignremexpr
+                   ;
+
+@assign_bitwise_expr = @assignandexpr
+                     | @assignorexpr
+                     | @assignxorexpr
+                     | @assignlshiftexpr
+                     | @assignrshiftexpr
+                     ;
+
+@assign_pointer_expr = @assignpaddexpr
+                     | @assignpsubexpr
+                     ;
+
+@assign_op_expr = @assign_arith_expr
+                | @assign_bitwise_expr
+                | @assign_pointer_expr
+                ;
+
+@assign_expr = @assignexpr | @assign_op_expr | @blockassignexpr
+
+/*
+  Binary encoding of the allocator form.
+
+  case @allocator.form of
+    0 = plain
+  | 1 = alignment
+  ;
+*/
+
+/**
+ * The allocator function associated with a `new` or `new[]` expression.
+ * The `form` column specified whether the allocation call contains an alignment
+ * argument.
+ */
+expr_allocator(
+    unique int expr: @any_new_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/*
+  Binary encoding of the deallocator form.
+
+  case @deallocator.form of
+    0 = plain
+  | 1 = size
+  | 2 = alignment
+  | 4 = destroying_delete
+  ;
+*/
+
+/**
+ * The deallocator function associated with a `delete`, `delete[]`, `new`, or
+ * `new[]` expression. For a `new` or `new[]` expression, the deallocator is the
+ * one used to free memory if the initialization throws an exception.
+ * The `form` column specifies whether the deallocation call contains a size
+ * argument, and alignment argument, or both.
+ */
+expr_deallocator(
+    unique int expr: @new_or_delete_expr ref,
+    int func: @function ref,
+    int form: int ref
+);
+
+/**
+ * Holds if the `@conditionalexpr` is of the two operand form
+ * `guard ? : false`.
+ */
+expr_cond_two_operand(
+    unique int cond: @conditionalexpr ref
+);
+
+/**
+ * The guard of `@conditionalexpr` `guard ? true : false`
+ */
+expr_cond_guard(
+    unique int cond: @conditionalexpr ref,
+    int guard: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` holds. For the two operand form
+ * `guard ?: false` consider using `expr_cond_guard` instead.
+ */
+expr_cond_true(
+    unique int cond: @conditionalexpr ref,
+    int true: @expr ref
+);
+
+/**
+ * The expression used when the guard of `@conditionalexpr`
+ * `guard ? true : false` does not hold.
+ */
+expr_cond_false(
+    unique int cond: @conditionalexpr ref,
+    int false: @expr ref
+);
+
+/** A string representation of the value. */
+values(
+    unique int id: @value,
+    string str: string ref
+);
+
+/** The actual text in the source code for the value, if any. */
+valuetext(
+    unique int id: @value ref,
+    string text: string ref
+);
+
+valuebind(
+    int val: @value ref,
+    unique int expr: @expr ref
+);
+
+fieldoffsets(
+    unique int id: @variable ref,
+    int byteoffset: int ref,
+    int bitoffset: int ref
+);
+
+bitfield(
+    unique int id: @variable ref,
+    int bits: int ref,
+    int declared_bits: int ref
+);
+
+/* TODO
+memberprefix(
+    int member: @expr ref,
+    int prefix: @expr ref
+);
+*/
+
+/*
+   kind(1) = mbrcallexpr
+   kind(2) = mbrptrcallexpr
+   kind(3) = mbrptrmbrcallexpr
+   kind(4) = ptrmbrptrmbrcallexpr
+   kind(5) = mbrreadexpr // x.y
+   kind(6) = mbrptrreadexpr // p->y
+   kind(7) = mbrptrmbrreadexpr // x.*pm
+   kind(8) = mbrptrmbrptrreadexpr // x->*pm
+   kind(9) = staticmbrreadexpr // static x.y
+   kind(10) = staticmbrptrreadexpr // static p->y
+*/
+/* TODO
+memberaccess(
+    int member: @expr ref,
+    int kind: int ref
+);
+*/
+
+initialisers(
+    unique int init: @initialiser,
+    int var: @accessible ref,
+    unique int expr: @expr ref,
+    int location: @location_default ref
+);
+
+braced_initialisers(
+    int init: @initialiser ref
+);
+
+/**
+ * An ancestor for the expression, for cases in which we cannot
+ * otherwise find the expression's parent.
+ */
+expr_ancestor(
+    int exp: @expr ref,
+    int ancestor: @element ref
+);
+
+exprs(
+    unique int id: @expr,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+expr_reuse(
+    int reuse: @expr ref,
+    int original: @expr ref,
+    int value_category: int ref
+)
+
+/*
+  case @value.category of
+    1 = prval
+  | 2 = xval
+  | 3 = lval
+  ;
+*/
+expr_types(
+    int id: @expr ref,
+    int typeid: @type ref,
+    int value_category: int ref
+);
+
+case @expr.kind of
+    1 = @errorexpr
+|   2 = @address_of // & AddressOfExpr
+|   3 = @reference_to // ReferenceToExpr (implicit?)
+|   4 = @indirect // * PointerDereferenceExpr
+|   5 = @ref_indirect // ReferenceDereferenceExpr (implicit?)
+// ...
+|   8 = @array_to_pointer // (???)
+|   9 = @vacuous_destructor_call // VacuousDestructorCall
+// ...
+|  11 = @assume // Microsoft
+|  12 = @parexpr
+|  13 = @arithnegexpr
+|  14 = @unaryplusexpr
+|  15 = @complementexpr
+|  16 = @notexpr
+|  17 = @conjugation // GNU ~ operator
+|  18 = @realpartexpr // GNU __real
+|  19 = @imagpartexpr // GNU __imag
+|  20 = @postincrexpr
+|  21 = @postdecrexpr
+|  22 = @preincrexpr
+|  23 = @predecrexpr
+|  24 = @conditionalexpr
+|  25 = @addexpr
+|  26 = @subexpr
+|  27 = @mulexpr
+|  28 = @divexpr
+|  29 = @remexpr
+|  30 = @jmulexpr // C99 mul imaginary
+|  31 = @jdivexpr // C99 div imaginary
+|  32 = @fjaddexpr // C99 add real + imaginary
+|  33 = @jfaddexpr // C99 add imaginary + real
+|  34 = @fjsubexpr // C99 sub real - imaginary
+|  35 = @jfsubexpr // C99 sub imaginary - real
+|  36 = @paddexpr // pointer add (pointer + int or int + pointer)
+|  37 = @psubexpr // pointer sub (pointer - integer)
+|  38 = @pdiffexpr // difference between two pointers
+|  39 = @lshiftexpr
+|  40 = @rshiftexpr
+|  41 = @andexpr
+|  42 = @orexpr
+|  43 = @xorexpr
+|  44 = @eqexpr
+|  45 = @neexpr
+|  46 = @gtexpr
+|  47 = @ltexpr
+|  48 = @geexpr
+|  49 = @leexpr
+|  50 = @minexpr // GNU minimum
+|  51 = @maxexpr // GNU maximum
+|  52 = @assignexpr
+|  53 = @assignaddexpr
+|  54 = @assignsubexpr
+|  55 = @assignmulexpr
+|  56 = @assigndivexpr
+|  57 = @assignremexpr
+|  58 = @assignlshiftexpr
+|  59 = @assignrshiftexpr
+|  60 = @assignandexpr
+|  61 = @assignorexpr
+|  62 = @assignxorexpr
+|  63 = @assignpaddexpr // assign pointer add
+|  64 = @assignpsubexpr // assign pointer sub
+|  65 = @andlogicalexpr
+|  66 = @orlogicalexpr
+|  67 = @commaexpr
+|  68 = @subscriptexpr // access to member of an array, e.g., a[5]
+// ...  69 @objc_subscriptexpr deprecated
+// ...  70 @cmdaccess deprecated
+// ...
+|  73 = @virtfunptrexpr
+|  74 = @callexpr
+// ...  75 @msgexpr_normal deprecated
+// ...  76 @msgexpr_super deprecated
+// ...  77 @atselectorexpr deprecated
+// ...  78 @atprotocolexpr deprecated
+|  79 = @vastartexpr
+|  80 = @vaargexpr
+|  81 = @vaendexpr
+|  82 = @vacopyexpr
+// ...  83 @atencodeexpr deprecated
+|  84 = @varaccess
+|  85 = @thisaccess
+// ...  86 @objc_box_expr deprecated
+|  87 = @new_expr
+|  88 = @delete_expr
+|  89 = @throw_expr
+|  90 = @condition_decl // a variable declared in a condition, e.g., if(int x = y > 2)
+|  91 = @braced_init_list
+|  92 = @type_id
+|  93 = @runtime_sizeof
+|  94 = @runtime_alignof
+|  95 = @sizeof_pack
+|  96 = @expr_stmt // GNU extension
+|  97 = @routineexpr
+|  98 = @type_operand // used to access a type in certain contexts (haven't found any examples yet....)
+|  99 = @offsetofexpr // offsetof ::= type and field
+| 100 = @hasassignexpr // __has_assign ::= type
+| 101 = @hascopyexpr // __has_copy ::= type
+| 102 = @hasnothrowassign // __has_nothrow_assign ::= type
+| 103 = @hasnothrowconstr // __has_nothrow_constructor ::= type
+| 104 = @hasnothrowcopy // __has_nothrow_copy ::= type
+| 105 = @hastrivialassign // __has_trivial_assign ::= type
+| 106 = @hastrivialconstr // __has_trivial_constructor ::= type
+| 107 = @hastrivialcopy // __has_trivial_copy ::= type
+| 108 = @hasuserdestr // __has_user_destructor ::= type
+| 109 = @hasvirtualdestr // __has_virtual_destructor ::= type
+| 110 = @isabstractexpr // __is_abstract ::= type
+| 111 = @isbaseofexpr // __is_base_of ::= type type
+| 112 = @isclassexpr // __is_class ::= type
+| 113 = @isconvtoexpr // __is_convertible_to ::= type type
+| 114 = @isemptyexpr // __is_empty ::= type
+| 115 = @isenumexpr // __is_enum ::= type
+| 116 = @ispodexpr // __is_pod ::= type
+| 117 = @ispolyexpr // __is_polymorphic ::= type
+| 118 = @isunionexpr // __is_union ::= type
+| 119 = @typescompexpr // GNU __builtin_types_compatible ::= type type
+| 120 = @intaddrexpr // frontend internal builtin, used to implement offsetof
+// ...
+| 122 = @hastrivialdestructor // __has_trivial_destructor ::= type
+| 123 = @literal
+| 124 = @uuidof
+| 127 = @aggregateliteral
+| 128 = @delete_array_expr
+| 129 = @new_array_expr
+// ... 130 @objc_array_literal deprecated
+// ... 131 @objc_dictionary_literal deprecated
+| 132 = @foldexpr
+// ...
+| 200 = @ctordirectinit
+| 201 = @ctorvirtualinit
+| 202 = @ctorfieldinit
+| 203 = @ctordelegatinginit
+| 204 = @dtordirectdestruct
+| 205 = @dtorvirtualdestruct
+| 206 = @dtorfielddestruct
+// ...
+| 210 = @static_cast
+| 211 = @reinterpret_cast
+| 212 = @const_cast
+| 213 = @dynamic_cast
+| 214 = @c_style_cast
+| 215 = @lambdaexpr
+| 216 = @param_ref
+| 217 = @noopexpr
+// ...
+| 294 = @istriviallyconstructibleexpr
+| 295 = @isdestructibleexpr
+| 296 = @isnothrowdestructibleexpr
+| 297 = @istriviallydestructibleexpr
+| 298 = @istriviallyassignableexpr
+| 299 = @isnothrowassignableexpr
+| 300 = @istrivialexpr
+| 301 = @isstandardlayoutexpr
+| 302 = @istriviallycopyableexpr
+| 303 = @isliteraltypeexpr
+| 304 = @hastrivialmoveconstructorexpr
+| 305 = @hastrivialmoveassignexpr
+| 306 = @hasnothrowmoveassignexpr
+| 307 = @isconstructibleexpr
+| 308 = @isnothrowconstructibleexpr
+| 309 = @hasfinalizerexpr
+| 310 = @isdelegateexpr
+| 311 = @isinterfaceclassexpr
+| 312 = @isrefarrayexpr
+| 313 = @isrefclassexpr
+| 314 = @issealedexpr
+| 315 = @issimplevalueclassexpr
+| 316 = @isvalueclassexpr
+| 317 = @isfinalexpr
+| 319 = @noexceptexpr
+| 320 = @builtinshufflevector
+| 321 = @builtinchooseexpr
+| 322 = @builtinaddressof
+| 323 = @vec_fill
+| 324 = @builtinconvertvector
+| 325 = @builtincomplex
+| 326 = @spaceshipexpr
+| 327 = @co_await
+| 328 = @co_yield
+| 329 = @temp_init
+| 330 = @isassignable
+| 331 = @isaggregate
+| 332 = @hasuniqueobjectrepresentations
+| 333 = @builtinbitcast
+| 334 = @builtinshuffle
+| 335 = @blockassignexpr
+| 336 = @issame
+| 337 = @isfunction
+| 338 = @islayoutcompatible
+| 339 = @ispointerinterconvertiblebaseof
+| 340 = @isarray
+| 341 = @arrayrank
+| 342 = @arrayextent
+| 343 = @isarithmetic
+| 344 = @iscompletetype
+| 345 = @iscompound
+| 346 = @isconst
+| 347 = @isfloatingpoint
+| 348 = @isfundamental
+| 349 = @isintegral
+| 350 = @islvaluereference
+| 351 = @ismemberfunctionpointer
+| 352 = @ismemberobjectpointer
+| 353 = @ismemberpointer
+| 354 = @isobject
+| 355 = @ispointer
+| 356 = @isreference
+| 357 = @isrvaluereference
+| 358 = @isscalar
+| 359 = @issigned
+| 360 = @isunsigned
+| 361 = @isvoid
+| 362 = @isvolatile
+| 363 = @reuseexpr
+| 364 = @istriviallycopyassignable
+| 365 = @isassignablenopreconditioncheck
+| 366 = @referencebindstotemporary
+| 367 = @issameas
+| 368 = @builtinhasattribute
+| 369 = @ispointerinterconvertiblewithclass
+| 370 = @builtinispointerinterconvertiblewithclass
+| 371 = @iscorrespondingmember
+| 372 = @builtiniscorrespondingmember
+| 373 = @isboundedarray
+| 374 = @isunboundedarray
+| 375 = @isreferenceable
+| 378 = @isnothrowconvertible
+| 379 = @referenceconstructsfromtemporary
+| 380 = @referenceconvertsfromtemporary
+| 381 = @isconvertible
+| 382 = @isvalidwinrttype
+| 383 = @iswinclass
+| 384 = @iswininterface
+| 385 = @istriviallyequalitycomparable
+| 386 = @isscopedenum
+| 387 = @istriviallyrelocatable
+| 388 = @datasizeof
+| 389 = @c11_generic
+| 390 = @requires_expr
+| 391 = @nested_requirement
+| 392 = @compound_requirement
+| 393 = @concept_id
+| 394 = @isinvocable
+| 395 = @isnothrowinvocable
+| 396 = @isbitwisecloneable
+;
+
+@var_args_expr = @vastartexpr
+               | @vaendexpr
+               | @vaargexpr
+               | @vacopyexpr
+               ;
+
+@builtin_op = @var_args_expr
+            | @noopexpr
+            | @offsetofexpr
+            | @intaddrexpr
+            | @hasassignexpr
+            | @hascopyexpr
+            | @hasnothrowassign
+            | @hasnothrowconstr
+            | @hasnothrowcopy
+            | @hastrivialassign
+            | @hastrivialconstr
+            | @hastrivialcopy
+            | @hastrivialdestructor
+            | @hasuserdestr
+            | @hasvirtualdestr
+            | @isabstractexpr
+            | @isbaseofexpr
+            | @isclassexpr
+            | @isconvtoexpr
+            | @isemptyexpr
+            | @isenumexpr
+            | @ispodexpr
+            | @ispolyexpr
+            | @isunionexpr
+            | @typescompexpr
+            | @builtinshufflevector
+            | @builtinconvertvector
+            | @builtinaddressof
+            | @istriviallyconstructibleexpr
+            | @isdestructibleexpr
+            | @isnothrowdestructibleexpr
+            | @istriviallydestructibleexpr
+            | @istriviallyassignableexpr
+            | @isnothrowassignableexpr
+            | @istrivialexpr
+            | @isstandardlayoutexpr
+            | @istriviallycopyableexpr
+            | @isliteraltypeexpr
+            | @hastrivialmoveconstructorexpr
+            | @hastrivialmoveassignexpr
+            | @hasnothrowmoveassignexpr
+            | @isconstructibleexpr
+            | @isnothrowconstructibleexpr
+            | @hasfinalizerexpr
+            | @isdelegateexpr
+            | @isinterfaceclassexpr
+            | @isrefarrayexpr
+            | @isrefclassexpr
+            | @issealedexpr
+            | @issimplevalueclassexpr
+            | @isvalueclassexpr
+            | @isfinalexpr
+            | @builtinchooseexpr
+            | @builtincomplex
+            | @isassignable
+            | @isaggregate
+            | @hasuniqueobjectrepresentations
+            | @builtinbitcast
+            | @builtinshuffle
+            | @issame
+            | @isfunction
+            | @islayoutcompatible
+            | @ispointerinterconvertiblebaseof
+            | @isarray
+            | @arrayrank
+            | @arrayextent
+            | @isarithmetic
+            | @iscompletetype
+            | @iscompound
+            | @isconst
+            | @isfloatingpoint
+            | @isfundamental
+            | @isintegral
+            | @islvaluereference
+            | @ismemberfunctionpointer
+            | @ismemberobjectpointer
+            | @ismemberpointer
+            | @isobject
+            | @ispointer
+            | @isreference
+            | @isrvaluereference
+            | @isscalar
+            | @issigned
+            | @isunsigned
+            | @isvoid
+            | @isvolatile
+            | @istriviallycopyassignable
+            | @isassignablenopreconditioncheck
+            | @referencebindstotemporary
+            | @issameas
+            | @builtinhasattribute
+            | @ispointerinterconvertiblewithclass
+            | @builtinispointerinterconvertiblewithclass
+            | @iscorrespondingmember
+            | @builtiniscorrespondingmember
+            | @isboundedarray
+            | @isunboundedarray
+            | @isreferenceable
+            | @isnothrowconvertible
+            | @referenceconstructsfromtemporary
+            | @referenceconvertsfromtemporary
+            | @isconvertible
+            | @isvalidwinrttype
+            | @iswinclass
+            | @iswininterface
+            | @istriviallyequalitycomparable
+            | @isscopedenum
+            | @istriviallyrelocatable
+            | @isinvocable
+            | @isnothrowinvocable
+            | @isbitwisecloneable
+            ;
+
+compound_requirement_is_noexcept(
+    int expr: @compound_requirement ref
+);
+
+new_allocated_type(
+    unique int expr: @new_expr ref,
+    int type_id: @type ref
+);
+
+new_array_allocated_type(
+    unique int expr: @new_array_expr ref,
+    int type_id: @type ref
+);
+
+param_ref_to_this(
+    int expr: @param_ref ref
+)
+
+/**
+ * The field being initialized by an initializer expression within an aggregate
+ * initializer for a class/struct/union. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_field_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int field: @membervariable ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+/**
+ * The index of the element being initialized by an initializer expression
+ * within an aggregate initializer for an array. Position is used to sort repeated initializers.
+ */
+#keyset[aggregate, position]
+aggregate_array_init(
+    int aggregate: @aggregateliteral ref,
+    int initializer: @expr ref,
+    int element_index: int ref,
+    int position: int ref,
+    boolean is_designated: boolean ref
+);
+
+@ctorinit = @ctordirectinit
+          | @ctorvirtualinit
+          | @ctorfieldinit
+          | @ctordelegatinginit;
+@dtordestruct = @dtordirectdestruct
+              | @dtorvirtualdestruct
+              | @dtorfielddestruct;
+
+
+condition_decl_bind(
+    unique int expr: @condition_decl ref,
+    unique int decl: @declaration ref
+);
+
+typeid_bind(
+    unique int expr: @type_id ref,
+    int type_id: @type ref
+);
+
+uuidof_bind(
+    unique int expr: @uuidof ref,
+    int type_id: @type ref
+);
+
+@sizeof_or_alignof = @runtime_sizeof | @runtime_alignof | @datasizeof | @sizeof_pack;
+
+sizeof_bind(
+    unique int expr: @sizeof_or_alignof ref,
+    int type_id: @type ref
+);
+
+code_block(
+    unique int block: @literal ref,
+    unique int routine: @function ref
+);
+
+lambdas(
+    unique int expr: @lambdaexpr ref,
+    string default_capture: string ref,
+    boolean has_explicit_return_type: boolean ref,
+    boolean has_explicit_parameter_list: boolean ref
+);
+
+lambda_capture(
+    unique int id: @lambdacapture,
+    int lambda: @lambdaexpr ref,
+    int index: int ref,
+    int field: @membervariable ref,
+    boolean captured_by_reference: boolean ref,
+    boolean is_implicit: boolean ref,
+    int location: @location_default ref
+);
+
+@funbindexpr = @routineexpr
+             | @new_expr
+             | @delete_expr
+             | @delete_array_expr
+             | @ctordirectinit
+             | @ctorvirtualinit
+             | @ctordelegatinginit
+             | @dtordirectdestruct
+             | @dtorvirtualdestruct;
+
+@varbindexpr = @varaccess | @ctorfieldinit | @dtorfielddestruct;
+@addressable = @function | @variable ;
+@accessible = @addressable | @enumconstant ;
+
+@access = @varaccess | @routineexpr ;
+
+fold(
+    int expr: @foldexpr ref,
+    string operator: string ref,
+    boolean is_left_fold: boolean ref
+);
+
+stmts(
+    unique int id: @stmt,
+    int kind: int ref,
+    int location: @location_default ref
+);
+
+case @stmt.kind of
+    1 = @stmt_expr
+|   2 = @stmt_if
+|   3 = @stmt_while
+|   4 = @stmt_goto
+|   5 = @stmt_label
+|   6 = @stmt_return
+|   7 = @stmt_block
+|   8 = @stmt_end_test_while // do { ... } while ( ... )
+|   9 = @stmt_for
+|  10 = @stmt_switch_case
+|  11 = @stmt_switch
+|  13 = @stmt_asm // "asm" statement or the body of an asm function
+|  15 = @stmt_try_block
+|  16 = @stmt_microsoft_try // Microsoft
+|  17 = @stmt_decl
+|  18 = @stmt_set_vla_size // C99
+|  19 = @stmt_vla_decl // C99
+|  25 = @stmt_assigned_goto // GNU
+|  26 = @stmt_empty
+|  27 = @stmt_continue
+|  28 = @stmt_break
+|  29 = @stmt_range_based_for // C++11
+// ...  30 @stmt_at_autoreleasepool_block deprecated
+// ...  31 @stmt_objc_for_in deprecated
+// ...  32 @stmt_at_synchronized deprecated
+|  33 = @stmt_handler
+// ...  34 @stmt_finally_end deprecated
+|  35 = @stmt_constexpr_if
+|  37 = @stmt_co_return
+|  38 = @stmt_consteval_if
+|  39 = @stmt_not_consteval_if
+|  40 = @stmt_leave
+;
+
+type_vla(
+    int type_id: @type ref,
+    int decl: @stmt_vla_decl ref
+);
+
+variable_vla(
+    int var: @variable ref,
+    int decl: @stmt_vla_decl ref
+);
+
+type_is_vla(unique int type_id: @derivedtype ref)
+
+if_initialization(
+    unique int if_stmt: @stmt_if ref,
+    int init_id: @stmt ref
+);
+
+if_then(
+    unique int if_stmt: @stmt_if ref,
+    int then_id: @stmt ref
+);
+
+if_else(
+    unique int if_stmt: @stmt_if ref,
+    int else_id: @stmt ref
+);
+
+constexpr_if_initialization(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int init_id: @stmt ref
+);
+
+constexpr_if_then(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int then_id: @stmt ref
+);
+
+constexpr_if_else(
+    unique int constexpr_if_stmt: @stmt_constexpr_if ref,
+    int else_id: @stmt ref
+);
+
+@stmt_consteval_or_not_consteval_if = @stmt_consteval_if | @stmt_not_consteval_if;
+
+consteval_if_then(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int then_id: @stmt ref
+);
+
+consteval_if_else(
+    unique int constexpr_if_stmt: @stmt_consteval_or_not_consteval_if ref,
+    int else_id: @stmt ref
+);
+
+while_body(
+    unique int while_stmt: @stmt_while ref,
+    int body_id: @stmt ref
+);
+
+do_body(
+    unique int do_stmt: @stmt_end_test_while ref,
+    int body_id: @stmt ref
+);
+
+switch_initialization(
+    unique int switch_stmt: @stmt_switch ref,
+    int init_id: @stmt ref
+);
+
+#keyset[switch_stmt, index]
+switch_case(
+    int switch_stmt: @stmt_switch ref,
+    int index: int ref,
+    int case_id: @stmt_switch_case ref
+);
+
+switch_body(
+    unique int switch_stmt: @stmt_switch ref,
+    int body_id: @stmt ref
+);
+
+@stmt_for_or_range_based_for = @stmt_for
+                             | @stmt_range_based_for;
+
+for_initialization(
+    unique int for_stmt: @stmt_for_or_range_based_for ref,
+    int init_id: @stmt ref
+);
+
+for_condition(
+    unique int for_stmt: @stmt_for ref,
+    int condition_id: @expr ref
+);
+
+for_update(
+    unique int for_stmt: @stmt_for ref,
+    int update_id: @expr ref
+);
+
+for_body(
+    unique int for_stmt: @stmt_for ref,
+    int body_id: @stmt ref
+);
+
+@stmtparent = @stmt | @expr_stmt ;
+stmtparents(
+    unique int id: @stmt ref,
+    int index: int ref,
+    int parent: @stmtparent ref
+);
+
+ishandler(unique int block: @stmt_block ref);
+
+@cfgnode = @stmt | @expr | @function | @initialiser ;
+
+stmt_decl_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl: @declaration ref
+);
+
+stmt_decl_entry_bind(
+    int stmt: @stmt_decl ref,
+    int num: int ref,
+    int decl_entry: @element ref
+);
+
+@parameterized_element = @function | @stmt_block | @requires_expr;
+
+blockscope(
+    unique int block: @stmt_block ref,
+    int enclosing: @parameterized_element ref
+);
+
+@jump = @stmt_goto | @stmt_break | @stmt_continue | @stmt_leave;
+
+@jumporlabel = @jump | @stmt_label | @literal;
+
+jumpinfo(
+    unique int id: @jumporlabel ref,
+    string str: string ref,
+    int target: @stmt ref
+);
+
+preprocdirects(
+    unique int id: @preprocdirect,
+    int kind: int ref,
+    int location: @location_default ref
+);
+case @preprocdirect.kind of
+   0 = @ppd_if
+|  1 = @ppd_ifdef
+|  2 = @ppd_ifndef
+|  3 = @ppd_elif
+|  4 = @ppd_else
+|  5 = @ppd_endif
+|  6 = @ppd_plain_include
+|  7 = @ppd_define
+|  8 = @ppd_undef
+|  9 = @ppd_line
+| 10 = @ppd_error
+| 11 = @ppd_pragma
+| 12 = @ppd_objc_import
+| 13 = @ppd_include_next
+| 14 = @ppd_ms_import
+| 15 = @ppd_elifdef
+| 16 = @ppd_elifndef
+| 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/d2d611b3fdcc7c4fe370f0d115200a3aa6ad5837/upgrade.properties b/cpp/ql/lib/upgrades/d2d611b3fdcc7c4fe370f0d115200a3aa6ad5837/upgrade.properties
new file mode 100644
index 000000000000..3ebeff31683b
--- /dev/null
+++ b/cpp/ql/lib/upgrades/d2d611b3fdcc7c4fe370f0d115200a3aa6ad5837/upgrade.properties
@@ -0,0 +1,2 @@
+description: Add new builtin operations and this parameter access table
+compatibility: backwards
\ No newline at end of file
diff --git a/cpp/ql/test/library-tests/builtins/type_traits/clang.cpp b/cpp/ql/test/library-tests/builtins/type_traits/clang.cpp
index 86008af19f7d..3db47a824ede 100644
--- a/cpp/ql/test/library-tests/builtins/type_traits/clang.cpp
+++ b/cpp/ql/test/library-tests/builtins/type_traits/clang.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --clang --clang_version 190000
+// semmle-extractor-options: --clang --clang_version 210000
 
 struct S {
     void f() {}
@@ -121,3 +121,11 @@ bool b_is_scoped_enum2 = __is_scoped_enum(int);
 
 bool b_is_trivially_relocatable1 = __is_trivially_relocatable(int);
 bool b_is_trivially_relocatable2 = __is_trivially_relocatable(void);
+
+struct S3{
+    S3(S3 &);
+    S3& operator=(S3&);
+};
+
+bool bok_is_bitwise_cloneable1 = __is_bitwise_cloneable(int);
+bool bok_is_bitwise_cloneable2 = __is_bitwise_cloneable(S3);
diff --git a/cpp/ql/test/library-tests/builtins/type_traits/expr.expected b/cpp/ql/test/library-tests/builtins/type_traits/expr.expected
index 55bf0757a49d..1728a48f4237 100644
--- a/cpp/ql/test/library-tests/builtins/type_traits/expr.expected
+++ b/cpp/ql/test/library-tests/builtins/type_traits/expr.expected
@@ -165,6 +165,10 @@
 | clang.cpp:122:36:122:66 | int |  | <none> |
 | clang.cpp:123:36:123:67 | __is_trivially_relocatable | void | 0 |
 | clang.cpp:123:36:123:67 | void |  | <none> |
+| clang.cpp:130:34:130:60 | __is_bitwise_cloneable | int | 1 |
+| clang.cpp:130:34:130:60 | int |  | <none> |
+| clang.cpp:131:34:131:59 | S3 |  | <none> |
+| clang.cpp:131:34:131:59 | __is_bitwise_cloneable | S3 | 0 |
 | file://:0:0:0:0 | 0 |  | 0 |
 | file://:0:0:0:0 | 0 |  | 0 |
 | file://:0:0:0:0 | 1 |  | 1 |
@@ -211,6 +215,16 @@
 | gcc.cpp:29:45:29:93 | __reference_converts_from_temporary | int &&,int && | 0 |
 | gcc.cpp:29:45:29:93 | int && |  | <none> |
 | gcc.cpp:29:45:29:93 | int && |  | <none> |
+| gcc.cpp:33:24:33:45 | __is_invocable | f_type | 1 |
+| gcc.cpp:33:24:33:45 | f_type |  | <none> |
+| gcc.cpp:34:24:34:51 | __is_invocable | f_type,bool | 0 |
+| gcc.cpp:34:24:34:51 | bool |  | <none> |
+| gcc.cpp:34:24:34:51 | f_type |  | <none> |
+| gcc.cpp:36:32:36:61 | __is_nothrow_invocable | f_type | 1 |
+| gcc.cpp:36:32:36:61 | f_type |  | <none> |
+| gcc.cpp:37:32:37:67 | __is_nothrow_invocable | f_type,bool | 0 |
+| gcc.cpp:37:32:37:67 | bool |  | <none> |
+| gcc.cpp:37:32:37:67 | f_type |  | <none> |
 | ms.cpp:38:41:38:45 | 0 |  | 0 |
 | ms.cpp:88:27:88:45 | __has_assign | empty | 0 |
 | ms.cpp:88:27:88:45 | empty |  | <none> |
diff --git a/cpp/ql/test/library-tests/builtins/type_traits/gcc.cpp b/cpp/ql/test/library-tests/builtins/type_traits/gcc.cpp
index 54224343e7e2..15f59812d2e9 100644
--- a/cpp/ql/test/library-tests/builtins/type_traits/gcc.cpp
+++ b/cpp/ql/test/library-tests/builtins/type_traits/gcc.cpp
@@ -1,4 +1,4 @@
-// semmle-extractor-options: --gnu_version 130000
+// semmle-extractor-options: --gnu_version 150000
 
 __attribute__ ((aligned(8))) int v;
 bool b_has_attribute1 = __builtin_has_attribute(v, aligned);
@@ -27,3 +27,11 @@ bool b_reference_constructs_from_temporary2 = __reference_constructs_from_tempor
 
 bool b_reference_converts_from_temporary1 = __reference_converts_from_temporary(int&&, int);
 bool b_reference_converts_from_temporary2 = __reference_converts_from_temporary(int&&, int&&);
+
+using f_type = void(*)() noexcept;
+
+bool b_is_invocable1 = __is_invocable(f_type);
+bool b_is_invocable2 = __is_invocable(f_type, bool);
+
+bool b_is_nothrow_invocable1 = __is_nothrow_invocable(f_type);
+bool b_is_nothrow_invocable2 = __is_nothrow_invocable(f_type, bool);